netzke-basepack 0.9.0 → 0.10.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7efff735638e53b2d16a815c6d2c34e7e0cb12ae
-  data.tar.gz: 4472d0094ce1ab7692814140edcba271fedee812
+  metadata.gz: 05ea131f48d4e9160ab59013eab24339cf2a02ee
+  data.tar.gz: 4427f9834bed24c2bec295f3c544161bd6652946
 SHA512:
-  metadata.gz: b02239f65587e5c3ea3209ba9d17f4f0072048e4009d613c7d49f2282383dbc6df793f6f812c80ac9a4408c1c6dd4e66fb65ea384bfdc456eef8cb259221a93a
-  data.tar.gz: f46a8460b5e5fa9dd86fb3c04a4cc4f5dbcd07dfcad77d7184e1f76ea240d7f00b92e2b022535734c41471844bf0de4dbfd738cc56bb979dd8e14c9d2dac6829
+  metadata.gz: 6778f91db1e4b96735be0bd362fd3c9a11cabab98e9b903ff0cd1813102bb4dd3ef995dbcbf0e85e2d4c8bf021e9a46eb916b82ae7c569ef982241a520249659
+  data.tar.gz: f90e509fd7744280fa280ac75283d7762919617575bb3b927bf36eb0a779f8c468015ea9a04d4c5e034d28a64bc382837da828d904a99d619ea6afb68681d925

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-# 0.9.0 - 2014-02-08
+# 0.9.0 - WIP
 * new
   * GridLiveSearch plugin - implements flexible "live" search on any grid
   * Implement multi-sorting support in grids

data/Gemfile

@@ -9,6 +9,9 @@ gemspec
 
 gem 'carrierwave'
 
+gem 'protected_attributes'
+
+# This partial duplication of gemspec is required for rails_app to run
 group :test do
   gem 'rspec'
   gem 'factory_girl'
@@ -17,9 +20,9 @@ group :test do
   gem 'cucumber-rails', require: false
   gem 'database_cleaner'
   gem 'rspec-rails'
+  gem 'netzke-testing', '0.10.0.rc1'
 end
 
 group :test, :development do
   gem 'pry-rails'
-  gem 'netzke-testing'
 end

data/README.md

@@ -1,9 +1,14 @@
-# Netzke Basepack [![Gem Version](https://badge.fury.io/rb/netzke-basepack.png)](http://badge.fury.io/rb/netzke-basepack) [![Build Status](https://travis-ci.org/netzke/netzke-basepack.png?branch=0-9)](https://travis-ci.org/netzke/netzke-basepack) [![Code Climate](https://codeclimate.com/github/netzke/netzke-basepack.png)](https://codeclimate.com/github/netzke/netzke-basepack)
+# Netzke Basepack [![Build Status](https://travis-ci.org/netzke/netzke-basepack.png?branch=master)](https://travis-ci.org/netzke/netzke-basepack) [![Code Climate](https://codeclimate.com/github/netzke/netzke-basepack.png)](https://codeclimate.com/github/netzke/netzke-basepack)
 
 [RDocs](http://rdoc.info/github/netzke/netzke-basepack)
 
 A pack of pre-built [Netzke](http://netzke.org) components that can be used as building blocks for your webapps.
 
+*Notes on versioning:*
+* [![Gem Version](https://badge.fury.io/rb/netzke-basepack.png)](http://badge.fury.io/rb/netzke-basepack) is the latest *released* version
+* for the version under development (master), check [version.rb](https://github.com/netzke/netzke-core/blob/master/lib/netzke/core/version.rb)
+* for other versions, check corresponding [branches](https://github.com/netzke/netzke-core/branches)
+
 ## Included components
 
 Basepack includes the following components:
@@ -23,8 +28,8 @@ enhancing any grid with live search functionality
 
 ## Requirements
 
-* Ruby >= 1.9.3
-* Rails ~> 3.2.0
+* Ruby ~> 1.9.2
+* Rails ~> 4.0.0
 * Ext JS ~> 4.2.0
 
 ## Installation

data/lib/netzke/basepack/data_adapters/active_record_adapter.rb

@@ -50,7 +50,7 @@ module Netzke::Basepack::DataAdapters
       # addressing the n+1 query problem
       columns.each do |c|
         assoc, method = c[:name].split('__')
-        relation = relation.includes(assoc.to_sym) if method
+        relation = relation.includes(assoc.to_sym).references(assoc.to_sym) if method
       end
 
       # apply sorting if needed
@@ -84,7 +84,7 @@ module Netzke::Basepack::DataAdapters
           relation.order("#{@model_class.table_name}.#{assoc} #{dir}")
         else
           assoc = @model_class.reflect_on_association(assoc.to_sym)
-          relation.includes(assoc.name).order("#{assoc.klass.table_name}.#{method} #{dir}")
+          relation.includes(assoc.name).references(assoc.klass.table_name.to_sym).order("#{assoc.klass.table_name}.#{method} #{dir}")
         end
       end
 
@@ -98,7 +98,7 @@ module Netzke::Basepack::DataAdapters
       # addressing the n+1 query problem
       columns.each do |c|
         assoc, method = c[:name].split('__')
-        relation = relation.includes(assoc.to_sym) if method
+        relation = relation.includes(assoc.to_sym).references(assoc.to_sym) if method
       end
 
       relation.count
@@ -128,7 +128,7 @@ module Netzke::Basepack::DataAdapters
       if assoc
         # Options for an asssociation attribute
 
-        relation = assoc.klass.scoped
+        relation = assoc.klass.all
         relation = relation.extend_with(attr[:scope]) if attr[:scope]
 
         if assoc.klass.column_names.include?(assoc_method)
@@ -140,7 +140,7 @@ module Netzke::Basepack::DataAdapters
         else
           query.downcase!
           # an expensive search!
-          relation.all.map{ |r| [r.id, r.send(assoc_method)] }.select{ |id,value| value.to_s.downcase.include?(query) }
+          relation.to_a.map{ |r| [r.id, r.send(assoc_method)] }.select{ |id,value| value.to_s.downcase.include?(query) }
         end
 
       else
@@ -304,7 +304,7 @@ module Netzke::Basepack::DataAdapters
 
     # An ActiveRecord::Relation instance encapsulating all the necessary conditions.
     def get_relation(params = {})
-      relation = @model_class.scoped
+      relation = @model_class.all
 
       query = params[:query]
 

data/lib/netzke/basepack/grid.rb

@@ -402,7 +402,7 @@ module Netzke
               if f[:value].is_a?(Hash)
                 val = {}
                 f[:value].each do |k,v|
-                  val[k] = (v.is_a?(Time) || v.is_a?(Date) || v.is_a?(ActiveSupport::TimeWithZone)) ?  ActiveSupport::JSON::Variable.new("new Date('#{v.strftime("%m/%d/%Y")}')") : v
+                  val[k] = (v.is_a?(Time) || v.is_a?(Date) || v.is_a?(ActiveSupport::TimeWithZone)) ? Netzke::Core::JsonLiteral.new("new Date('#{v.strftime("%m/%d/%Y")}')") : v
                 end
               else
                 val = f[:value]

data/lib/netzke/basepack/version.rb

@@ -1,5 +1,5 @@
 module Netzke
   module Basepack
-    VERSION = "0.9.0"
+    VERSION = "0.10.0.rc2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netzke-basepack
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0.rc2
 platform: ruby
 authors:
 - Max Gorin
@@ -14,30 +14,30 @@ dependencies:
   name: netzke-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0.rc2
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: netzke-testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0.rc1
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -203,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.4
 requirements: []
-rubyforge_project: netzke-basepack
+rubyforge_project: 
 rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4