acts_as_extjs 0.3.2 → 0.3.3

data/Rakefile

@@ -12,26 +12,26 @@ begin
     gem.authors = ["Marco Scholl"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_runtime_dependency "activerecord", ">= 3.0.0"
-    gem.add_runtime_dependency "will_paginate", "~> 3.0.pre2"
+    gem.add_runtime_dependency "rails_paginate", ">= 0.0.0"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
+#require 'spec/rake/spectask'
+#Spec::Rake::SpecTask.new(:spec) do |spec|
+#  spec.libs << 'lib' << 'spec'
+#  spec.spec_files = FileList['spec/**/*_spec.rb']
+#end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
+#Spec::Rake::SpecTask.new(:rcov) do |spec|
+#  spec.libs << 'lib' << 'spec'
+#  spec.pattern = 'spec/**/*_spec.rb'
+#  spec.rcov = true
+#end
 
-task :spec => :check_dependencies
+#task :spec => :check_dependencies
 
 begin
   require 'reek/adapters/rake_task'

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/acts_as_extjs.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_extjs}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marco Scholl"]
-  s.date = %q{2010-10-10}
+  s.date = %q{2011-04-19}
   s.description = %q{ActiveRecord Helper for Extjs}
   s.email = %q{develop@marco-scholl.de}
   s.extra_rdoc_files = [
@@ -17,44 +17,41 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gemspec",
-     ".gitignore",
-     "MIT-LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "acts_as_extjs.gemspec",
-     "lib/acts_as_extjs.rb",
-     "spec/acts_as_extjs_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    "MIT-LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "acts_as_extjs.gemspec",
+    "lib/acts_as_extjs.rb",
+    "spec/acts_as_extjs_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/traxanos/acts_as_extjs}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{ActiveRecord Helper for Extjs}
   s.test_files = [
-    "spec/spec_helper.rb",
-     "spec/acts_as_extjs_spec.rb"
+    "spec/acts_as_extjs_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0"])
-      s.add_runtime_dependency(%q<will_paginate>, ["~> 3.0.pre2"])
+      s.add_runtime_dependency(%q<rails_paginate>, [">= 0.0.0"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<activerecord>, [">= 3.0.0"])
-      s.add_dependency(%q<will_paginate>, ["~> 3.0.pre2"])
+      s.add_dependency(%q<rails_paginate>, [">= 0.0.0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<activerecord>, [">= 3.0.0"])
-    s.add_dependency(%q<will_paginate>, ["~> 3.0.pre2"])
+    s.add_dependency(%q<rails_paginate>, [">= 0.0.0"])
   end
 end
 

data/lib/acts_as_extjs.rb

@@ -1,6 +1,3 @@
-require 'rubygems'
-require 'active_record'
-
 module Extjs #:nodoc:
   module ActsAsExtjs #:nodoc:
 
@@ -12,16 +9,16 @@ module Extjs #:nodoc:
       # activate gem on ar-model with acts_as_extjs
       #
       # -----
-      # 
+      #
       # === Example:
-      #   class User
-      #     acts_as_extjs
-      #   end
-      # 
+      # class User
+      # acts_as_extjs
+      # end
+      #
       def acts_as_extjs
         scope :extjs
-        
-	include Extjs::ActsAsExtjs::InstanceMethods
+
+        include Extjs::ActsAsExtjs::InstanceMethods
         extend Extjs::ActsAsExtjs::SingletonMethods
       end
     end
@@ -34,28 +31,31 @@ module Extjs #:nodoc:
       # -----
       #
       # === Options:
-      # <tt>:fields</tt>::       List with hashes like extjs store fields.
-      #                          <tt>:name</tt>::          Name off field. This will be call on row if not use an custom handler
-      #                          <tt>:custom</tt>::        can use with Proc.new for own field content
-      #                          <tt>:mapping</tt>::       Client side mapping by extjs store
+      # <tt>:fields</tt>:: List with hashes like extjs store fields.
+      # <tt>:name</tt>:: Name off field. This will be call on row if not use an custom handler
+      # <tt>:custom</tt>:: can use with Proc.new for own field content
+      # <tt>:mapping</tt>:: Client side mapping by extjs store
       # <tt>:sort_mapping</tt>:: A Hash to map columns
-      #                          :fieldname => "sqlfiels"
-      #                          :user_name => "users.name"
-      # <tt>:start</tt>::        start value from extjs paginate toolbar
-      # <tt>:limit</tt>::        limit value from extjs paginate toolbar
-      # <tt>:page</tt>::         page - will overritten if start/limit set
-      # <tt>:per_page</tt>::     per_page - will overritten if start/limit set
-      # <tt>:sort_by</tt>::      sort field. ignore fields that are not in sort_mapping and use this mapping
-      # <tt>:group_by</tt>::     group field. ignore fields that are not in sort_mapping and use this mapping
-      # <tt>:sort_dir</tt>::     direction: asc | desc
-      # <tt>:group_dir</tt>::    direction: asc | desc
-      # 
+      # :fieldname => "sqlfiels"
+      # :user_name => "users.name"
+      # <tt>:start</tt>:: start value from extjs paginate toolbar
+      # <tt>:limit</tt>:: limit value from extjs paginate toolbar
+      # <tt>:page</tt>:: page - will overritten if start/limit set
+      # <tt>:per_page</tt>:: per_page - will overritten if start/limit set
+      # <tt>:sort_by</tt>:: sort field. ignore fields that are not in sort_mapping and use this mapping
+      # <tt>:group_by</tt>:: group field. ignore fields that are not in sort_mapping and use this mapping
+      # <tt>:sort_dir</tt>:: direction: asc | desc
+      # <tt>:group_dir</tt>:: direction: asc | desc
+      #
       # -----
-      # 
+      #
       # === Example:
-      #   render :json => User.extjs_result :fields = [{:name => :superid, :type => :id, :custom => Proc.new { |row| row.id }}]
+      # render :json => User.extjs_result :fields = [{:name => :superid, :type => :id, :custom => Proc.new { |row| row.id }}]
       #
       def extjs_result(*args)
+        extjs_scope = self.extjs
+
+
         options = args.extract_options!
         fields = options.delete(:fields)
         start = options.delete(:start).to_i
@@ -88,16 +88,17 @@ module Extjs #:nodoc:
             order = sort_mapping[group_by.to_sym].to_s + group_dir + ', ' + order
           end
 
-          options[:order] = order if order
+          extjs_scope = extjs_scope.order(order) if order
         end
 
+
         if limit.to_i > 0 or options[:per_page].to_i > 0
           options[:per_page] = limit if limit > 0
           options[:page] = (start > 0) ? (start/limit)+1 : 1
-          result = self.extjs.paginate options
-          total = result.total_entries
+          result = extjs_scope.paginate options
+          total = result.total
         else
-          result = self.extjs.all options
+          result = extjs_scope.all options
           total = result.size
         end
 
@@ -119,17 +120,17 @@ module Extjs #:nodoc:
           rows << row
         end
 
-        return {
-                :total => total,
-                :data => rows,
-                :metaData => {
-                        :root => :data,
-                        :messageProperty => 'message',
-                        :successProperty => 'success',
-                        :fields => fields,
-                        :idProperty => :id,
-                        :totalProperty => :total,
-                        }
+        {
+          :total => total,
+          :data => rows,
+          :metaData => {
+            :root => :data,
+            :messageProperty => 'message',
+            :successProperty => 'success',
+            :fields => fields,
+            :idProperty => :id,
+            :totalProperty => :total,
+          }
         }
       end
     end
@@ -159,10 +160,9 @@ module Extjs #:nodoc:
           end
           hash["#{self.class.name.downcase}[#{field}]"] = message
         end
-        return hash
+        hash
       end
     end
   end
 end
-
 ActiveRecord::Base.send(:include, Extjs::ActsAsExtjs)

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_extjs
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 2
-  version: 0.3.2
+  prerelease: 
+  version: 0.3.3
 platform: ruby
 authors: 
 - Marco Scholl
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-10 00:00:00 +02:00
+date: 2011-04-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,10 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 9
         version: 1.2.9
   type: :development
   version_requirements: *id001
@@ -40,26 +32,18 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: will_paginate
+  name: rails_paginate
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - pre2
-        version: 3.0.pre2
+        version: 0.0.0
   type: :runtime
   version_requirements: *id003
 description: ActiveRecord Helper for Extjs
@@ -72,7 +56,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gemspec
-- .gitignore
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
@@ -87,8 +70,8 @@ homepage: http://github.com/traxanos/acts_as_extjs
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -96,24 +79,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: ActiveRecord Helper for Extjs
 test_files: 
-- spec/spec_helper.rb
 - spec/acts_as_extjs_spec.rb
+- spec/spec_helper.rb

data/.gitignore

@@ -1,12 +0,0 @@
-# rcov generated
-coverage
-
-# rdoc generated
-rdoc
-
-# yard generated
-doc
-.yardoc
-
-# jeweler generated
-pkg