A lot of miscellaneous bug fixes.

Author: zuhao

lib/plotrb/base.rb

@@ -166,6 +166,10 @@ def collect_attributes
           json_attr = classify(k, :json)
           if v.respond_to?(:collect_attributes)
             collected[json_attr] = v.collect_attributes
+          elsif v.is_a?(Array)
+            collected[json_attr] = [].concat(v.collect{ |va|
+              va.respond_to?(:collect_attributes) ? va.collect_attributes : va
+            })
           else
             collected[json_attr] = v
           end

lib/plotrb/data.rb

@@ -44,8 +44,12 @@ def format(*args, &block)
     end
 
     def extra_fields
-      @extra_fields ||= [:index]
-      @extra_fields.concat(@transform.collect { |t| t.extra_fields }).uniq!
+      @extra_fields ||= [:data, :index]
+      if @transform
+        @extra_fields.concat(@transform.collect { |t| t.extra_fields }).
+            flatten!.uniq!
+      end
+      @extra_fields
     end
 
     def method_missing(method, *args, &block)

lib/plotrb/marks.rb

@@ -62,29 +62,37 @@ def properties
     end
 
     def enter(&block)
+      process_from
       @properties.merge!(
-          { enter: ::Plotrb::Mark::MarkProperty.new(@type, @from, &block) }
+          { enter: ::Plotrb::Mark::MarkProperty.
+              new(@type, @from[:data], &block) }
       )
       self
     end
 
     def exit(&block)
+      process_from
       @properties.merge!(
-          { exit: ::Plotrb::Mark::MarkProperty.new(@type, @from, &block) }
+          { exit: ::Plotrb::Mark::MarkProperty.
+              new(@type, @from[:data], &block) }
       )
       self
     end
 
     def update(&block)
+      process_from
       @properties.merge!(
-          { update: ::Plotrb::Mark::MarkProperty.new(@type, @from, &block) }
+          { update: ::Plotrb::Mark::MarkProperty.
+              new(@type, @from[:data], &block) }
       )
       self
     end
 
     def hover(&block)
+      process_from
       @properties.merge!(
-          { hover: ::Plotrb::Mark::MarkProperty.new(@type, @from, &block) }
+          { hover: ::Plotrb::Mark::MarkProperty.
+              new(@type, @from[:data], &block) }
       )
       self
     end
@@ -105,7 +113,7 @@ def process_name
     end
 
     def process_from
-      return unless @from
+      return unless @from && !@from_processed
       from = {}
       @from.each do |f|
         case f
@@ -125,6 +133,7 @@ def process_from
         end
       end
       @from = from
+      @from_processed = true
     end
 
     def process_group
@@ -383,7 +392,7 @@ def attribute_post_processing
         def process_field
           return unless @field
           case @field
-            when String
+            when String, Symbol
               @field = get_full_field_ref(@field)
             when Hash
               if @field[:group]
@@ -418,10 +427,16 @@ def process_scale
         end
 
         def get_full_field_ref(field)
-          data = ::Plotrb::Kernel.find_data(@data)
-          if field.start_with?('data.') ||
-              data.extra_fields.include?(field.to_sym)
+          data = if @data.is_a?(::Plotrb::Data)
+                   @data
+                 else
+                   ::Plotrb::Kernel.find_data(@data)
+                 end
+          extra_fields = (data.extra_fields if data) || []
+          if field.to_s.start_with?('data.')
             field
+          elsif extra_fields.include?(field.to_sym)
+            classify(field, :json)
           else
             "data.#{field}"
           end

lib/plotrb/transforms.rb

@@ -24,7 +24,7 @@ class Transform
 
     def initialize(type, &block)
       @type = type
-      @extra_fields = []
+      @extra_fields = [:index, :data]
       self.send(@type)
       self.instance_eval(&block) if block_given?
       ::Plotrb::Kernel.transforms << self
@@ -330,6 +330,7 @@ def pie
       add_attributes(:sort, :value)
       define_boolean_attribute(:sort)
       define_single_val_attribute(:value)
+      @extra_fields.concat([:start_angle, :end_angle])
     end
 
     def stack
@@ -512,8 +513,12 @@ def process_link_target
     end
 
     def process_pie_value
-      return unless @type == :pie && @value
-      @value = get_full_field_ref(@value)
+      return unless @type == :pie
+      if @value
+        @value = get_full_field_ref(@value)
+      else
+        @value = 'data'
+      end
     end
 
     def process_stack_order
@@ -553,10 +558,17 @@ def process_wordcloud_font_size
     end
 
     def get_full_field_ref(field)
-      if field.start_with?('data.') || extra_fields.include?(field.to_sym)
-        field
-      else
-        "data.#{field}"
+      case field
+        when String
+          if field.start_with?('data.') || extra_fields.include?(field.to_sym)
+            field
+          else
+            "data.#{field}"
+          end
+        when ::Plotrb::Data
+          'data'
+        else
+          raise ArgumentError, 'Invalid data field'
       end
     end
 

lib/plotrb/visualization.rb

@@ -28,11 +28,7 @@ class Visualization
     add_attributes :name, :width, :height, :viewport, :padding, :data, :scales,
                   :marks, :axes
 
-    def initialize(args={}, &block)
-      default = {width: 500, height: 500}
-      args.reverse_merge(default).each do |k, v|
-        self.instance_variable_set("@#{k}", v) if self.attributes.include?(k)
-      end
+    def initialize(&block)
       define_single_val_attributes(:name, :width, :height, :viewport, :padding)
       define_multi_val_attributes(:data, :scales, :marks, :axes)
       self.instance_eval(&block) if block_given?
@@ -46,6 +42,12 @@ def generate_spec(format=nil)
       end
     end
 
+  private
+
+    def attribute_post_processing
+
+    end
+
   end
 
 end

spec/plotrb/marks_spec.rb

@@ -21,6 +21,8 @@
   describe 'properties' do
 
     it 'allows multiple properties' do
+      ::Plotrb::Kernel.stub(:find_data).with('some_data').and_return(true)
+      subject.from('some_data')
       subject.enter
       subject.exit
       subject.properties.keys.should match_array([:enter, :exit])