the_grid 1.0.7 → 1.0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWI3ODZiNmIxNzlkYzkxYzIxNjY5ZWMxNGFmMWZlZWMyNjQ1NGRiNw==
+    MzdhN2E2MTBhNzFlMTIxZjVlNTI0ZWEyMzEzZmRiZjU0OWMxMGUwNQ==
   data.tar.gz: !binary |-
-    YmVkOGMwNjRjYmJjYTI0MWM3ZmM5ODZmNTkyOTAxZjFjMjdiMDcwMA==
+    NGU5MzBiZGVhNDYxN2ZjZDhjYTA5MWY3NGNlZDlkZWIyODM0MzBkNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDA1ZmJmZjIwYjAzNGQyNTFjOWQwYWRkM2UxZjkzZjYzZDg4YjdiOGZkZDVm
-    ZjUzZTc2YWIzNzA1MTlmMGM2MTI5NmEzOGU1MjE0ZjFjNTM1NjI5Y2U2OGU5
-    NDVkZmMxYWUxMWRiNmIzYzQwYTIwNzljMTkyYzg2MmFjNzdjN2Q=
+    ZTZjNTBkYTQ2MGZlOTZiYThkOTE4OWY5OTQzMjYwMzA5ZmI3NGVkMzJhZTI3
+    MWM5OWFhYzhiM2M4OThlZWY5ZmVkMjdkMjg4MWYwM2E5ZTFmNWIwMTg5MmFm
+    MjIyZTEyMTJkYTgyMWExYTU4YjU0Yjc0Zjc1YTJkMmZhZDQ2ZjY=
   data.tar.gz: !binary |-
-    OWQzNGE2YzlhOGM4NzkxMWViOGNhMzcxMjg1NWFhZjhhZTc0ZTFmM2M5OWFl
-    NGQ3MTBiMzk1ZGZlZDllNDQwMThiNWQ3ZTFmZTA2ZWZhNzA1NzIyNjhkYTRh
-    MjY1OWFlNGM5YTIzNjNlNGRlM2RlOTRlZGIxMWJhODFlYWQ4OGE=
+    M2Q0ZDlkODY4Yzg2MjZmM2VhMjJiYWFhMWQwMTA2OWU5MmI2YzAxNjYwMzY4
+    NjZkZTRkZTJlZTYxYWNmNzQwZTE0MjA1MzE5OWM0ZGYyY2E4ODc2MmRjNzdi
+    OGJlMTY5MTc5YmFmNWJlNzU4ZTAxMTMzYmM4MzFkOGZlN2E4MzI=

data/Gemfile

@@ -1,4 +1,3 @@
 source "http://rubygems.org"
 
 gemspec
-gem 'cover_me', '>= 1.2.0', :group => :test

data/lib/the_grid/builder/context.rb

@@ -1,11 +1,11 @@
 module TheGrid
   class Builder::Context
-    attr_reader :columns, :options, :scope, :name
+    attr_reader :columns, :scope
 
     def initialize(options = {}, &dsl)
-      @scope   = options.delete(:scope)
-      @options = options
-      @columns = { :id => {:hidden => true} }
+      @scope    = options.delete(:scope)
+      @columns  = build_columns_with(options.delete(:id))
+      @options  = options.merge(:features => [])
 
       self.instance_eval(&dsl)
     end
@@ -21,9 +21,8 @@ module TheGrid
       if @scope.respond_to?(method_name)
         @scope.send(method_name, *args, &block)
       elsif method_name.to_s.ends_with?("ble_columns")
-        feature = method_name.to_s.chomp("_columns")
-        mark_columns_with(feature.to_sym, args)
-        @options[method_name.to_sym] = args
+        @options[:features] << method_name.to_s.chomp("_columns").to_sym
+        mark_columns_with(@options[:features].last, args)
       else
         @options[method_name] = args.size == 1 ? args.first : args
       end
@@ -34,6 +33,14 @@ module TheGrid
       column name, attributes.merge(:as => Builder::Context.new(:scope => scope, &block), :scope_name => scope_name)
     end
 
+    def options
+      @options.except(:features)
+    end
+
+    def params
+      self.options.merge self.featured_columns
+    end
+
     def visible_columns
       columns.each_with_object({}) do |column, vc|
         name, options = column
@@ -48,6 +55,12 @@ module TheGrid
 
   protected
 
+    def build_columns_with(id_field)
+      columns = {}
+      columns[id_field || :id] = {:hidden => true} unless id_field === false
+      columns
+    end
+
     def find_or_build_column(name)
       @columns[name.to_sym] ||= {}
     end
@@ -58,6 +71,12 @@ module TheGrid
       end
     end
 
+    def featured_columns
+      @options[:features].each_with_object({}) do |feature, types|
+        types[:"#{feature}_columns"] = columns.select{ |name, attrs| attrs[feature] }.keys
+      end
+    end
+
     def assemble_row_for(record)
       columns.each_with_object({}) do |column, row|
         name, options = column

data/lib/the_grid/builder/json.rb

@@ -9,7 +9,7 @@ module TheGrid
     end
 
     def assemble_with(params)
-      options = params.merge context.options
+      options = params.merge context.params
       api.compose!(options)
       stringify as_json_with(options)
     rescue ArgumentError => error

data/lib/the_grid/version.rb

@@ -1,3 +1,3 @@
 module TheGrid
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end

data/spec/builder/context_spec.rb

@@ -7,10 +7,20 @@ describe TheGrid::Builder::Context do
   let(:options) {{ :per_page => 25, :scope => parent_scope }}
 
   context "by default" do
-    it "has hidden id column" do
+    it "creates hidden id column" do
       build_context.columns[:id].should have_key(:hidden)
     end
 
+    it "creates hidden column with specified primary key name" do
+      options[:id] = :key
+      build_context.columns[:key].should have_key(:hidden)
+    end
+
+    it "does not create column for primary key if :id equals false" do
+      options[:id] = false
+      build_context.columns.should have(0).items
+    end
+
     it "stores specified options" do
       build_context.options[:per_page].should eql options[:per_page]
     end
@@ -39,13 +49,17 @@ describe TheGrid::Builder::Context do
       columns[:name].values_at(:test, :value).should eql [true, 5]
     end
 
-    it "marks columns as featurable" do
+    it "marks columns as featured" do
       columns = build_context{ searchable_columns :name, :text }.columns
       columns.slice(:name, :text).should be_all{ |k, v| v[:searchable] == true }
     end
 
-    it "stores featureable columns in options" do
-      build_context{ searchable_columns :name, :text }.options[:searchable_columns].should eql [:name, :text]
+    it "defines featured columns in params" do
+      build_context{ searchable_columns :name, :text }.params[:searchable_columns].should eql [:name, :text]
+    end
+
+    it "does not define featured columns in options" do
+      build_context{ searchable_columns :name, :text }.options[:searchable_columns].should be_blank
     end
 
     it "accepts single option's values" do
@@ -92,7 +106,7 @@ describe TheGrid::Builder::Context do
     let(:fields)  {{ :title => "item", :id => 5, :live? => false, :short_details => "details" }}
     let(:records) {[ double(fields), double(fields.merge :live? => true) ]}
 
-    context "records" do
+    describe "result" do
       subject { context.assemble(records) }
       let(:context) { build_plane_context }
 
@@ -102,7 +116,7 @@ describe TheGrid::Builder::Context do
       it { should be_all{ |r| r.keys == context.columns.keys }}
     end
 
-    context "any structure" do
+    describe "any structure" do
       subject{ build_plane_context }
       after(:each){ subject.assemble(records) }
 
@@ -119,7 +133,7 @@ describe TheGrid::Builder::Context do
       end
     end
 
-    context "tree-like structure" do
+    describe "tree-like structure" do
       let(:conditional_option) { :if }
       let(:fields) {{ :id => 5, :live? => false, :permanent => [], :conditional => [], :conditional_block => [] }}
       after(:each) { build_tree_like_context(conditional_option).assemble(records) }
@@ -179,4 +193,4 @@ describe TheGrid::Builder::Context do
     TheGrid::Builder::Context.new(options, &dsl)
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: the_grid
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Sergiy Stotskiy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-08 00:00:00.000000000 Z
+date: 2013-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord