admin_it 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d370fe1c01e8e574315d4d5988d8b6bae33d5b39
-  data.tar.gz: fdfa047dee1d91755c46e7cda5159c52a59f9ef9
+  metadata.gz: d3a63565c2793d51ed2992d7d4e01deeecc68543
+  data.tar.gz: 2fe03cded06fe4a4fedc76b2244f727a9dfaa876
 SHA512:
-  metadata.gz: efcfb8cce0d3a3d5c273cecba04587d71f2a942685b29df42a0c4337078167487f27c77c4eca241759de54436d1653af8d7bf007da86a97ff1e1870f633a5bef
-  data.tar.gz: 05b34351cab3a244be6e070b81f1992fb63665b9cb7546509f1651e0ed8ba5510375fd30e76b7ba25fc9c2cbb51b2dfe4757d57a8ed56cffcd254055ccce00e2
+  metadata.gz: 1cc3714caf30a63432ca69c6bed8ab1e6b01947918b6f7024daeb9a8951fbd026c1ec7ede09037b61386f0622e2971f0d1b2ae25a9c5532125bebb5169bc647b
+  data.tar.gz: ed25582af138eca0e80f23b1e2205880b4a74bc6ad830c74adf027ebfcf6eed05407e0180b14e2f15b074df284ba1362bf16b75f9c5f79d3f33ce8516431f4b9

data/README.md

@@ -28,6 +28,7 @@ bundle install
 # Todo
 
 * use_fields not working in root resource context
+* human-readable date and time fields
 * Test coverage
 * Entities editing/creating
 
@@ -37,6 +38,10 @@ bundle install
 
 # Changes
 
+`1.0.6`
+
+* fixed: [#1](/../../issues/1)
+
 `1.0.5`
 
 * font-awesome asset path fix

data/app/views/admin_it/shared/_filters.html.slim

@@ -24,13 +24,13 @@
             - if filter.values.include?(v[:value])
               - a_class = 'label-success'
               - href = url_for(for_context.url_params( \
-                filters: "#{filter.name}(-#{filter.value(v[:value])})", \
+                filters: "!#{filter.name}(-#{filter.value(v[:value])})", \
                 active_filter: filter.name \
               ))
             - else
               - a_class = 'label-info'
               - href = url_for(for_context.url_params( \
-                filters: "#{filter.name}(+#{filter.value(v[:value])})", \
+                filters: "!#{filter.name}(+#{filter.value(v[:value])})", \
                 active_filter: filter.name \
               ))
             a class="label #{a_class}" href==href

data/lib/admin_it/context/collection_context.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'csv'
 require File.join %w(extend_it symbolize)
 
 using ExtendIt::Symbolize
@@ -128,23 +129,7 @@ module AdminIt
         @filters ||= {}
         value.strip!
         @filters = {} if value.empty?
-        value.split(/[;|]/).each do |str|
-          str.strip!
-          remove = str[0] == '-'
-          str = str[1..-1] if remove
-          m = Filter::REGEXP.match(str)
-          next if m.nil?
-          if remove
-            @filters.delete(m[:name].to_sym)
-          else
-            name = m[:name].to_sym
-            if @filters.key?(name)
-              @filters[name].change(m[:params])
-            else
-              @filters[name] = Filter.load(str, self.class.filters)
-            end
-          end
-        end
+        Filter.apply(value, @filters, self.class.filters)
       else
         @filters = {}
       end

data/lib/admin_it/filters/filter.rb

@@ -15,9 +15,30 @@ module AdminIt
     include ExtendIt::Callbacks
     extend ExtendIt::Asserts
 
-    REGEXP = /\A(?<name>[a-zA-Z_][a-zA-Z0-9_]*)(?:\((?<params>[^)]*)\))?\z/
-
-    define_callbacks :save
+    REGEXP = /
+      (?<=\A|[,;|])\s*
+      (?<full>
+        (?<action>[!+\-])?
+        (?<name>[a-zA-Z_][a-zA-Z0-9_]*)
+        (?:\((?<params>[^)]*)\))?
+      )
+      \s*(?=[,;|]|\z)
+    /x
+
+    ARGUMENT_REGEXP = /
+      (?<=\A|[,;|])\s*
+      (?:
+        (?:(?<action>[+\-])|(?:(?<option>[a-zA-Z_][a-zA-Z0-9_]*)\s*:\s*))?
+        (?<token>
+          (?:'(?:[^\\']|\\.)*')|
+          (?:"(?:[^\\"]|\\.)*")|
+          (?:[^,;|\s]+)
+        )
+      )
+      \s*(?=[,;|]|\z)
+    /x
+
+    define_callbacks :initialize, :save, :load
 
     class << self
       extend ExtendIt::Dsl
@@ -49,29 +70,38 @@ module AdminIt
       create_class(name, _resource)
     end
 
-    def self.load(str, filters)
+    def self.load(str, filter_classes)
       m = REGEXP.match(str)
-      return nil if m.nil?
+      return nil if m.nil? || m[:action] == '-'
       name = m[:name].to_sym
-      filter_class = filters.find { |f| f.filter_name == name }
+      filter_class = filter_classes.find { |f| f.filter_name == name }
       return nil if filter_class.nil?
-      opts = {}
-      args = m[:params].nil? ? [] : m[:params].split(',').map do |param|
-        param.strip!
-        arr = param.split(':')
-        if arr.size > 1
-          opts[arr[0].strip.to_sym] = arr[1].strip
-          nil
+      filter = filter_class.new
+      filter.load(m[:params])
+      filter
+    end
+
+    def self.apply(str, filters, filter_classes)
+      list = str.scan(Filter::REGEXP)
+      filters.clear if list.all? { |_, act, _, _| act.nil? || act.empty? }
+      list.each do |full, action, name, params|
+        name = name.to_sym
+        if action == '-'
+          filters.delete(name)
+        elsif action == '!'
+          filters[name].load(params) if filters.key?(name)
         else
-          arr[0]
+          filters[name] = Filter.load(full, filter_classes)
         end
       end
-      args << opts unless opts.empty?
-      filter_class.new(*args.compact)
     end
 
     class_attr_reader :display_name
 
+    def initialize
+      run_callbacks :initialize
+    end
+
     def name
       @name ||= self.class.filter_name
     end
@@ -90,7 +120,13 @@ module AdminIt
       result
     end
 
-    def change(str)
+    def load(str)
+      return if str.nil?
+      args = parse_arguments(str)
+      unless args.empty?
+        opts = args.extract_options!
+        run_callbacks :load, arguments: { arguments: args, options: opts }
+      end
     end
 
     def apply(collection)
@@ -117,6 +153,34 @@ module AdminIt
     TIME_REGEXP = /\A#{TIME}\z/
     DATETIME_REGEXP = /\A#{DATE}(?:\s+|[\/.\-])#{TIME}\z/
 
+    def param_action(str)
+      case str
+      when '+' then :add
+      when '-' then :remove
+      else nil
+      end
+    end
+
+    def parse_arguments(str)
+      opts = {}
+      args = []
+      parent = self.class.parents.find do |p|
+        p.const_defined?(:ARGUMENT_REGEXP)
+      end
+      unless parent.nil?
+        str.scan(parent.const_get(:ARGUMENT_REGEXP)) do |a, o, v|
+          if o.nil? || o.empty?
+            action = param_action(a)
+            action.nil? ? args << v : (opts[action] ||= []) << v
+          else
+            opts[o.to_sym] = v
+          end
+        end
+      end
+      args << opts unless opts.empty?
+      args
+    end
+
     def parse_argument(arg)
       return arg unless arg.is_a?(String)
       arg.strip!

data/lib/admin_it/filters/value_filter.rb

@@ -2,27 +2,25 @@ module AdminIt
   class ValueFilter < FieldFilter
     attr_reader :values
 
-    def initialize(*values, **opts)
-      @values = values.map { |v| parse_argument(v) }.uniq
+    def initialize
+      @values = []
     end
 
     before_save do |arguments: [], options: {}|
       arguments.concat(@values.map { |v| create_argument(v) })
     end
 
-    def change(str)
-      return if str.nil? || !str.is_a?(String) || str.empty?
-      @values = [] unless /[+\-]/ =~ str
-      str.split(',').each do |param|
-        param.strip!
-        if param[0] == '-'
-          @values.delete_if { |v| v == parse_argument(param[1..-1]) }
-        else
-          param = param[1..-1] if param[0] == '+'
-          @values << parse_argument(param)
+    after_load do |arguments: [], options: {}|
+      unless arguments.empty?
+        @values = arguments.map { |v| parse_argument(v) }.uniq
+      end
+      if options.key?(:add)
+        @values.concat(options[:add].map { |v| parse_argument(v) }).uniq!
+      elsif options.key?(:remove)
+        options[:remove].each do |remove|
+          @values.delete_if { |v| v == parse_argument(remove) }
         end
       end
-      @values.uniq!
     end
 
     def all_values(collection = nil, &block)

data/lib/admin_it/version.rb

@@ -1,5 +1,5 @@
 #
 module AdminIt
   # Current gem version
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: admin_it
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Alexey Ovchinnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails