the_grid 1.0.8 → 1.0.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzdhN2E2MTBhNzFlMTIxZjVlNTI0ZWEyMzEzZmRiZjU0OWMxMGUwNQ==
+    MTE1YjBhNmMwMmNiZTk4MjJiYTAzYmM4ZTc3Nzk3ZWM1NmRkOGUxNw==
   data.tar.gz: !binary |-
-    NGU5MzBiZGVhNDYxN2ZjZDhjYTA5MWY3NGNlZDlkZWIyODM0MzBkNQ==
+    YzZkNGM1ZDMxOTZkZjg5YmMzMmExZDg1N2Q5YTEzYjNkOWJmOTNjYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTZjNTBkYTQ2MGZlOTZiYThkOTE4OWY5OTQzMjYwMzA5ZmI3NGVkMzJhZTI3
-    MWM5OWFhYzhiM2M4OThlZWY5ZmVkMjdkMjg4MWYwM2E5ZTFmNWIwMTg5MmFm
-    MjIyZTEyMTJkYTgyMWExYTU4YjU0Yjc0Zjc1YTJkMmZhZDQ2ZjY=
+    YWE1NDcwMTYwZDAzOWRiMTAwN2M2ZmIzYzBhOGVlZjYzZjI4ZDcyOTZjOGMy
+    NDY1MjgyNGE4ZmU2ZDhkOTk4MTE3NTJhYWIxNzdjZTMyMzE2ZGJhYmIzZTBk
+    ODk2OWUxNjFjNTMxMmViYTExMDI3MmE0ZTE2MzU2NWFiM2UzNzg=
   data.tar.gz: !binary |-
-    M2Q0ZDlkODY4Yzg2MjZmM2VhMjJiYWFhMWQwMTA2OWU5MmI2YzAxNjYwMzY4
-    NjZkZTRkZTJlZTYxYWNmNzQwZTE0MjA1MzE5OWM0ZGYyY2E4ODc2MmRjNzdi
-    OGJlMTY5MTc5YmFmNWJlNzU4ZTAxMTMzYmM4MzFkOGZlN2E4MzI=
+    NDEyMWRjYjUxNmM5MzUwYzA1YWJmZDM1NDBkMzIzZDY4MzllOTlkZDJkZGM3
+    NTc1MDU5MzI4YjdhMzM3ZjljYWRmZTMxZjVlMmQ1NGM1NDQ3NjM4MjBkYTQ0
+    MWY5YzBlMTY1NjM0N2ZjNmY5NTU5YmY4NTg0YjlmNzhkNDYwMzg=

data/.rvmrc

@@ -1 +1 @@
-rvm use --create 1.9.3-p392@grid
+rvm use 1.9.3-p392@grid --create

data/README.md

@@ -239,6 +239,7 @@ Sometimes it's reasonable to add extra meta information into response:
 ```ruby
 grid_for @articles, :per_page => 2 do
   searchable_columns :title, :created_at
+  editable_columns :title
 
   # specify any kind of meta parameter
   server_time Time.now
@@ -256,15 +257,17 @@ The previous example is converted into:
     "server_time": "2013-03-17 02:11:05 +0200",
     "my_option": "Something important for Frontend side"
   },
-  "columns": {
-    "title": {
+  "columns": [
+    {
+      "name": "title",
       "searchable": true,
       "editable": true
     },
-    "created_at": {
+    {
+      "name": "created_at",
       "searchable": true
     }
-  },
+  ],
   "max_page": 3,
   "items": [
     {

data/lib/the_grid/builder/context.rb

@@ -42,10 +42,9 @@ module TheGrid
     end
 
     def visible_columns
-      columns.each_with_object({}) do |column, vc|
-        name, options = column
+      columns.each_with_object({}) do |(name,options), vc|
         vc[name] = options.except(:as, :if, :unless) unless options[:hidden]
-        vc[name] = options[:as].visible_columns if options[:as].respond_to?(:visible_columns)
+        vc[name] = {:columns => options[:as].visible_columns} if options[:as].respond_to?(:visible_columns)
       end
     end
 

data/lib/the_grid/builder/json.rb

@@ -23,15 +23,24 @@ module TheGrid
     end
 
     def as_json_with(options)
-      {}.tap do |json|
-        json[:meta], json[:columns] = context.options.except(:delegate, :search_over), context.visible_columns if options[:with_meta]
-        json[:max_page] = api.options[:max_page]
-        json[:items] = context.assemble(api.relation)
+      json = {:max_page => api.options[:max_page], :items => context.assemble(api.relation)}
+      if options[:with_meta]
+        json[:meta] = context.options.except(:delegate, :search_over)
+        json[:columns] = columns_as_array(context.visible_columns)
       end
+      json
     end
 
     def as_json_message(status, message)
       {:status => status, :message => message}
     end
+
+    def columns_as_array(columns)
+      columns.map do |name, options|
+        options[:columns] = columns_as_array(options[:columns]) if options[:columns].is_a? Hash
+        options.merge :name => name
+      end
+    end
+
   end
 end

data/lib/the_grid/version.rb

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

data/spec/builder/context_spec.rb

@@ -93,12 +93,16 @@ describe TheGrid::Builder::Context do
   context "when collects visible columns" do
     let(:parent_scope){ double(:dsl => Proc.new{ column :title; column :name, :hidden => true }) }
 
+    it "returns hash" do
+      build_context(&parent_scope.dsl).visible_columns.should be_kind_of Hash
+    end
+
     it "returns only visible columns" do
       build_context(&parent_scope.dsl).visible_columns.keys.should eql [:title]
     end
 
     it "respects visible columns of nested scopes" do
-      build_context{ scope_for(:children, &dsl) }.visible_columns[:children].keys.should eql [:title]
+      build_context{ scope_for(:children, &dsl) }.visible_columns[:children][:columns].keys.should eql [:title]
     end
   end
 

data/spec/builder/json_spec.rb

@@ -9,7 +9,8 @@ describe TheGrid::Builder::Json do
   let(:context) { create_context.tap { |c| c.stub(:assemble => [1,2,3,4]) } }
   let(:params) {{  :cmd => [:sort], :field => :name, :order => :desc }}
 
-  let(:meta) {{ "meta" => {"api_key" => context.options[:api_key]}, "columns" => context.visible_columns.stringify_keys }}
+  let(:meta) {{ "meta" => {"api_key" => context.options[:api_key]}, "columns" => columns }}
+  let(:columns) { context.visible_columns.stringify_keys.map{ |n, o| o.merge "name" => n } }
   let(:json_schema) {{ "max_page" => 25, "items" => context.assemble }}
   let(:assembled_result) { JSON.parse(subject.assemble_with(params)) }
 

data/the_grid.gemspec

@@ -18,7 +18,10 @@ Provides json API for building ActiveRecord::Relation's.  It makes much easier t
 Tags: json, grid, api, grid builder, activerecord relation builder, relation
 EOF
 
-  s.rubyforge_project = "the_grid"
+  s.post_install_message = <<-_MSG_
+    Columns' definition in json response is changed
+    because javascript does not remember the order of properties in object.
+  _MSG_
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -27,8 +30,7 @@ EOF
 
   s.add_dependency 'activerecord', '>= 3.0'
   s.add_dependency 'json'
-
-  # specify any dependencies here; for example:
+  
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "rspec", "~> 2.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: the_grid
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.10
 platform: ruby
 authors:
 - Sergiy Stotskiy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -117,7 +117,8 @@ homepage: http://github.com/stalniy/grid
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: ! "    Columns' definition in json response is changed\n    because
+  javascript does not remember the order of properties in object.\n"
 rdoc_options: []
 require_paths:
 - lib
@@ -132,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: the_grid
+rubyforge_project: 
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4