optimacms 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25b9f802954ca4bb509e4b7bc23ee59f68faec3a
-  data.tar.gz: a5e4e4d7780a955fe16a270a11fe431ddc9b1857
+  metadata.gz: a5c71915c85fc8f8b2c3b927bc7fc5b7c44f91ac
+  data.tar.gz: 2ff1155e854f1b56f6407ec212bcf585c8128a6b
 SHA512:
-  metadata.gz: 02fea7a619ed35c6e02c8bbf320f40b3f53e127d2b1610daaf224c070983cfca00303622d8eb6fdd8fc2f9ed34060abfcff9f5cbbdef8b7bc645b8e36d81b32f
-  data.tar.gz: 6fecad147162631701695674effd21e767f02c7c2d498681ce1ff569d726fb43fa4f60fdcb151b33631ee572e69346672f9f4aa02bfa436c05ce0b844bbd83e9
+  metadata.gz: 86d108c522d1c97bd753052ae6e9988e17285d7f286385647dc233647e2a5ca6bbd15750252468647a32f572b831ce48ee4f0dc3c91b82406ef47402c33bd758
+  data.tar.gz: e3af7c37bd671c11116fe67c6b7e4abdf0c87dfa83c2e1c7ac2f154f02e415ce76b572b263e5244b36772fc5e6402427c4a220c373d2e97a802307c090a531c3

data/app/controllers/optimacms/admin/pages_controller.rb

@@ -138,10 +138,8 @@ module Optimacms
 
 
     # filter
+    include SimpleFilters::Controller
 
-    def filter_prefix
-      'admin_pages'
-    end
 
     def init_tabledata
       init_filter
@@ -152,7 +150,7 @@ module Optimacms
       @pg = params[:pg].to_i || 1
 
       #
-      @filter = Filters::FormFilter.new(session, filter_prefix)
+      @filter = Filters::FormFilter.new(session, 'admin_pages')
 
       # set filter fields
       @filter.add_fields_from_array(

data/lib/optimacms/filters/form_filter.rb

@@ -1,228 +0,0 @@
-module Optimacms
-
-
-  module Filters
-    class FormFilter
-
-      FIELD_TYPE_TEXT = 'text'
-      FIELD_TYPE_HIDDEN = 'hidden'
-      FIELD_TYPE_SELECT_AUTO = 'select_auto' # text with autocomplete
-
-      DBTYPE_STRING = 'string'
-      DBTYPE_INT = 'int'
-      DBTYPE_DATE = 'date'
-
-      #
-      attr_accessor :prefix # session prefix
-      attr_accessor :fields
-      attr_accessor :data
-      #attr_accessor :order # [ ["order_column", "asc|desc"], ..]
-
-
-
-      def initialize(_session, _prefix)
-        @prefix = _prefix
-        @session = _session
-
-        @fields ||={}
-
-        # init data
-        data()
-      end
-
-
-      ############
-      # fields
-      ############
-
-      def add_field(f)
-        @fields[f[:name]] = f
-
-      end
-
-      def add_fields_from_array(a)
-        a.each do |fa|
-          add_field fa
-        end
-
-      end
-
-
-      def field_def_value(name)
-        if (@fields.has_key? name) && (@fields[name].has_key? :def)
-          return @fields[name][:def]
-        end
-        nil
-      end
-
-      ############
-      # sessions
-      ############
-
-      def session_get(name, def_value)
-        @session[prefix+name] || def_value
-      end
-
-      def session_save(name, v)
-        @session[prefix+name] = v
-      end
-
-
-      ############
-      # data
-      ############
-
-
-      def data
-        return @data unless @data.nil?
-
-        # from session
-        @data_sess = session_get 'data', nil
-        unless @data_sess.nil?
-          @data = @data_sess
-        else
-
-        end
-
-        #
-        @data ||= {}
-
-        session_save('data', @data)
-
-        #
-        @data
-      end
-
-      def v(name, v_def=nil)
-        if (data.has_key? name) && (!data[name].nil?)
-          return data[name]
-        end
-
-        field_def_value(name) || v_def
-      end
-
-      def v_empty?(name)
-        if (data.has_key? name) && (!data[name].nil?)
-          return true
-        end
-
-        # if v == default value
-
-      end
-
-      def set(field_name,v)
-        data[field_name] = v
-      end
-
-
-      def clear_data
-        session_save 'data', {}
-      end
-
-      def set_data_from_form(params)
-        # search for fields like filter[XXX]
-        params.each do |name, v|
-          #if f =~ /^filter\[([^\]]+)\]$/
-            #name = Regexp.last_match(1)
-
-            next unless @fields.has_key? name
-
-            if @fields[name][:dbtype]==DBTYPE_INT
-              data[name] = (v.to_i rescue 0)
-            else
-              data[name] = v
-            end
-
-          #end
-        end
-
-        # default values from fields
-        @fields.each do |name, f|
-          next if @data.has_key? name
-
-          @data[name] = field_def_value name
-        end
-
-      end
-
-
-
-      ####
-      # order
-      ####
-
-      def order
-        return @order unless @order.nil?
-
-        # from session
-        @v_sess = session_get 'order', nil
-        @order = @v_sess unless @v_sess.nil?
-
-        #
-        @order ||= []
-
-        session_save 'order', @order
-
-        #
-        @order
-      end
-
-      def order= (value)
-        @order = value
-
-        session_save 'order', @order
-      end
-
-      def set_order_default(order_by, order_dir)
-        return false if !order.nil? && !order.empty?
-
-        set_order(order_by, order_dir)
-
-      end
-
-
-      def set_order(order_by, order_dir)
-        self.order = [[order_by, order_dir]]
-      end
-
-      def get_order
-        order[0] if order.count>0
-        order[0]
-      end
-
-
-      def get_opposite_order_dir_for_column(name)
-        return 'asc' if order.empty?
-
-
-        if order[0][0] == name
-          return opposite_order_dir(order[0][1])
-        end
-
-        return 'asc'
-      end
-
-      def opposite_order_dir(order_dir)
-        return 'asc' if order_dir=='desc'
-        return 'desc' if order_dir=='asc'
-        'asc'
-      end
-
-
-
-      #helper methods
-
-      def html_style(name)
-        return '' unless @fields[name].has_key?(:opt)
-
-        s = ''
-        opt = @fields[name][:opt]
-        unless opt[:width].nil?
-          s << "width: #{opt[:width]}px; "
-        end
-      end
-    end
-
-  end
-
-end

data/lib/optimacms/version.rb

@@ -1,3 +1,3 @@
 module Optimacms
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/simple_filter/controller.rb

@@ -0,0 +1,14 @@
+module SimpleFilter
+  module Controller
+    extend ActiveSupport::Concern
+
+    included do
+
+    end
+
+    class_methods do
+
+    end
+
+  end
+end

data/lib/simple_filter/filter.rb

@@ -0,0 +1,223 @@
+module SimpleFilter
+  class Filter
+
+    FIELD_TYPE_TEXT = 'text'
+    FIELD_TYPE_HIDDEN = 'hidden'
+    FIELD_TYPE_SELECT_AUTO = 'select_auto' # text with autocomplete
+
+    DBTYPE_STRING = 'string'
+    DBTYPE_INT = 'int'
+    DBTYPE_DATE = 'date'
+
+    #
+    attr_accessor :prefix # session prefix
+    attr_accessor :fields
+    attr_accessor :data
+    #attr_accessor :order # [ ["order_column", "asc|desc"], ..]
+
+
+
+    def initialize(_session, _prefix)
+      @prefix = _prefix
+      @session = _session
+
+      @fields ||={}
+
+      # init data
+      data()
+    end
+
+
+    ############
+    # fields
+    ############
+
+    def add_field(f)
+      @fields[f[:name]] = f
+
+    end
+
+    def add_fields_from_array(a)
+      a.each do |fa|
+        add_field fa
+      end
+
+    end
+
+
+    def field_def_value(name)
+      if (@fields.has_key? name) && (@fields[name].has_key? :def)
+        return @fields[name][:def]
+      end
+      nil
+    end
+
+    ############
+    # sessions
+    ############
+
+    def session_get(name, def_value)
+      @session[prefix+name] || def_value
+    end
+
+    def session_save(name, v)
+      @session[prefix+name] = v
+    end
+
+
+    ############
+    # data
+    ############
+
+
+    def data
+      return @data unless @data.nil?
+
+      # from session
+      @data_sess = session_get 'data', nil
+      unless @data_sess.nil?
+        @data = @data_sess
+      else
+
+      end
+
+      #
+      @data ||= {}
+
+      session_save('data', @data)
+
+      #
+      @data
+    end
+
+    def v(name, v_def=nil)
+      if (data.has_key? name) && (!data[name].nil?)
+        return data[name]
+      end
+
+      field_def_value(name) || v_def
+    end
+
+    def v_empty?(name)
+      if (data.has_key? name) && (!data[name].nil?)
+        return true
+      end
+
+      # if v == default value
+
+    end
+
+    def set(field_name,v)
+      data[field_name] = v
+    end
+
+
+    def clear_data
+      session_save 'data', {}
+    end
+
+    def set_data_from_form(params)
+      # search for fields like filter[XXX]
+      params.each do |name, v|
+        #if f =~ /^filter\[([^\]]+)\]$/
+          #name = Regexp.last_match(1)
+
+          next unless @fields.has_key? name
+
+          if @fields[name][:dbtype]==DBTYPE_INT
+            data[name] = (v.to_i rescue 0)
+          else
+            data[name] = v
+          end
+
+        #end
+      end
+
+      # default values from fields
+      @fields.each do |name, f|
+        next if @data.has_key? name
+
+        @data[name] = field_def_value name
+      end
+
+    end
+
+
+
+    ####
+    # order
+    ####
+
+    def order
+      return @order unless @order.nil?
+
+      # from session
+      @v_sess = session_get 'order', nil
+      @order = @v_sess unless @v_sess.nil?
+
+      #
+      @order ||= []
+
+      session_save 'order', @order
+
+      #
+      @order
+    end
+
+    def order= (value)
+      @order = value
+
+      session_save 'order', @order
+    end
+
+    def set_order_default(order_by, order_dir)
+      return false if !order.nil? && !order.empty?
+
+      set_order(order_by, order_dir)
+
+    end
+
+
+    def set_order(order_by, order_dir)
+      self.order = [[order_by, order_dir]]
+    end
+
+    def get_order
+      order[0] if order.count>0
+      order[0]
+    end
+
+
+    def get_opposite_order_dir_for_column(name)
+      return 'asc' if order.empty?
+
+
+      if order[0][0] == name
+        return opposite_order_dir(order[0][1])
+      end
+
+      return 'asc'
+    end
+
+    def opposite_order_dir(order_dir)
+      return 'asc' if order_dir=='desc'
+      return 'desc' if order_dir=='asc'
+      'asc'
+    end
+
+
+
+    #helper methods
+
+    def html_style(name)
+      return '' unless @fields[name].has_key?(:opt)
+
+      s = ''
+      opt = @fields[name][:opt]
+      unless opt[:width].nil?
+        s << "width: #{opt[:width]}px; "
+      end
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: optimacms
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Max Ivak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -306,6 +306,8 @@ files:
 - lib/optimacms/page_services/page_route_service.rb
 - lib/optimacms/simple_form_extensions/button_components.rb
 - lib/optimacms/version.rb
+- lib/simple_filter/controller.rb
+- lib/simple_filter/filter.rb
 - lib/tasks/optimacms_tasks.rake
 - test/controllers/optimacms/articles_controller_test.rb
 - test/dummy/README.rdoc
@@ -2381,7 +2383,6 @@ files:
 - test/dummy/tmp/cache/assets/development/sprockets/fedc8f629673405d3bbcd26e9e0b977d
 - test/dummy/tmp/cache/assets/development/sprockets/ff9ed89418a3f78032b8f8184dd98e80
 - test/dummy/tmp/cache/assets/development/sprockets/fff5cc1f57d172a75379719781f39cea
-- test/dummy/tmp/pids/server.pid
 - test/fixtures/optimacms/articles.yml
 - test/integration/navigation_test.rb
 - test/models/optimacms/article_test.rb
@@ -4486,7 +4487,6 @@ test_files:
 - test/dummy/tmp/cache/assets/development/sprockets/fedc8f629673405d3bbcd26e9e0b977d
 - test/dummy/tmp/cache/assets/development/sprockets/ff9ed89418a3f78032b8f8184dd98e80
 - test/dummy/tmp/cache/assets/development/sprockets/fff5cc1f57d172a75379719781f39cea
-- test/dummy/tmp/pids/server.pid
 - test/fixtures/optimacms/articles.yml
 - test/integration/navigation_test.rb
 - test/models/optimacms/article_test.rb

data/test/dummy/tmp/pids/server.pid

@@ -1 +0,0 @@
-9372