table_me 0.0.2 → 0.0.3

data/lib/table_me/filter.rb

@@ -9,6 +9,10 @@ module TableMe
     
     @@filters = {}
 
+    def self.init
+      @@filters = {}
+    end
+
     def initialize options, column_name
       self.options = options
       self.column_name = column_name

data/lib/table_me/table_for_helper/table_for_helper.rb

@@ -58,8 +58,9 @@ require_relative '../table_for_presenter'
 
 module TableMe
   module TableForHelper
-    def table_for(model,options = {}, &block)
-      table_for_presenter = TableForPresenter.new(model,options,&block)
+    def table_for(model, options = {}, &block)
+
+      table_for_presenter = TableForPresenter.new(model, @table_me[model],options,&block)
       table_for_presenter.build_table
     end
     

data/lib/table_me/table_for_presenter.rb

@@ -71,15 +71,17 @@ module TableMe
     attr_accessor :name, :options
     attr_reader :data
 
-    def initialize table_name, options = {}, &block
-      # self.parent = parent
-      self.options = options
+    def initialize table_name, table_me_presenter, options = {}, &block
+      @table_me_presenter = table_me_presenter
+
+      self.options = ActiveSupport::HashWithIndifferentAccess.new(options.merge(@table_me_presenter.options))
       self.name = table_name
       @block = block
 
       # required to get capture to work with haml
       init_haml_helpers if defined?(Haml)
 
+      setup_classes
       process_data_attributes 
     end
 
@@ -110,20 +112,25 @@ module TableMe
     # of the class variables in the controller and view, but there has to be a better way to do it.
     # TODO decouple this and options below
     def data
-      TableMePresenter.data[name.to_s]
+      @table_me_presenter.data
     end
 
 
     # same as data above, only with table options. Ideally this needs to be a value object instead
     # of just a hash. TODO use a value object instead of a hash, see table_vo.rb
-    def options
-      TableMePresenter.options[name.to_s]
-    end
+    # def options
+    #   @table_me_presenter.options
+    # end
 
 
     private
 
 
+    def setup_classes
+      # clear the filter saved to class
+      TableMe::Filter.init
+    end
+
     # create table filters if they exist
     def table_filters
       <<-HTML if table_builder.filters

data/lib/table_me/table_me_helper/table_me_helper.rb

@@ -22,6 +22,9 @@ module TableMe
   module TableMeHelper
     def table_me(model, options = {})
       table_presenter = TableMePresenter.new(model, options,params)
+      @table_me ||= {}
+      @table_me[table_presenter.name] = table_presenter
+
       table_presenter.name
     end
   end

data/lib/table_me/table_me_presenter.rb

@@ -19,29 +19,26 @@ module TableMe
     attr_accessor :params, :name
     attr_reader :data, :options
 
-    class << self
-      def data
-        @@data
-      end
-
-      def options
-        @@options
-      end
-    end
-
-    @@data = {}
-    @@options = {}
+    # class << self
+    #   # These class variables may need to be cleared and data handled differently
+    #   def data
+    #     @@data
+    #   end
+
+    #   def options
+    #     @@options
+    #   end
+    # end
+
+    # @@data = {}
+    # @@options = {}
     
     def initialize model, options = {}, params = {}
-      # this was more of a patch for the code. I need to go back through and normalize all
-      # the hash access so a normal has can be used with confidence
-      # TODO normalize hash access to strings or symbols
       @options = ActiveSupport::HashWithIndifferentAccess.new(options)
 
       set_defaults_for model
       parse_params_for params
       get_data_for model
-      @@options[self.name] = @options
     end
 
     # parse the params into an options hash that we can use
@@ -62,9 +59,7 @@ module TableMe
     def get_data_for model
       model = apply_search_to(model)
 
-      @@data[self.name] = @data = model.limit(options[:per_page])
-                                       .offset(start_item)
-                                       .order(options[:order])
+      @data = model.limit(options[:per_page]).offset(start_item).order(options[:order])
 
       options[:total_count] = model.count
       options[:page_total] = (options[:total_count] / options[:per_page].to_f).ceil

data/lib/table_me/version.rb

@@ -1,3 +1,3 @@
 module TableMe
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: table_me
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70146233853140 !ruby/object:Gem::Requirement
+  requirement: &70190781557660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70146233853140
+  version_requirements: *70190781557660
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70146233852700 !ruby/object:Gem::Requirement
+  requirement: &70190781549020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70146233852700
+  version_requirements: *70190781549020
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70146233852220 !ruby/object:Gem::Requirement
+  requirement: &70190781548180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146233852220
+  version_requirements: *70190781548180
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70146233851800 !ruby/object:Gem::Requirement
+  requirement: &70190781547760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146233851800
+  version_requirements: *70190781547760
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70146233851360 !ruby/object:Gem::Requirement
+  requirement: &70190781547340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146233851360
+  version_requirements: *70190781547340
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70146233850900 !ruby/object:Gem::Requirement
+  requirement: &70190781546860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146233850900
+  version_requirements: *70190781546860
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70146233850480 !ruby/object:Gem::Requirement
+  requirement: &70190781546420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146233850480
+  version_requirements: *70190781546420
 description: Widget table gem for Rails 3.1.3+
 email:
 - adamrensel@gmail.com