set_builder 1.2.0.beta2 → 1.2.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad5a691ebe74c5868f2b6bd1ed58b6bfc1e3d5c3
-  data.tar.gz: 98ad1930d226f419016b39588013352fb50ffc80
+  metadata.gz: b72932fe9a27cb708e417d352685eb5a2737c702
+  data.tar.gz: 56c5cd7d3731616a8647e927a43d81e0a076b94c
 SHA512:
-  metadata.gz: 50f80ac7bf9a588b0f60c1ac5a5836462b37aedebe25fb97b1509241cd8ba352cd9a463ad41af411b9fb405ee6531be5a42b579f6490d5590f1370490dc1f122
-  data.tar.gz: 5df7956306cc4a5063e0550ea78d20aa636b898f19557e4d455876b9af631aa7caeebc0e59ac6c54d0964a6ffe38862a09b6ccc22f680f313e70ac9117c41cbf
+  metadata.gz: 7d2fdb5e59c579e37246537c3313cc60deb1344b3eed5793d741a769388c3529f6ac2e9fbeb8a49e03e6695c816375b24489f0f0debac7c1b86866129b30ff9e
+  data.tar.gz: 226cb56332e3daab5df7ce0f5c4089f1bd3608bccdaa9c2dde55c69e90d2c1ab35983355f0381d081305db741b70b04d967034c2016fe9e77059b8944b414cc7

data/.travis.yml

@@ -1,6 +1,6 @@
 # .travis.yml
 language: ruby
 rvm:
-  - 2.0.0
+  - 2.1.2
 script:
   - bundle exec rake test

data/lib/assets/javascripts/set_builder.js

@@ -33,6 +33,17 @@ var SetBuilder = (function() {
       return _value_maps[key];
     },
     getValue: function(key, value) {
+      if(Object.prototype.toString.call(value) == '[object Array]') {
+        var getValue = arguments.callee;
+        var values = value.__collect(function(value) { return getValue(key, value) });
+        switch(values.length) {
+          case 0: return '';
+          case 1: return values[0];
+          case 2: return values[0] + ' or ' + values[1];
+          default: return values.slice(0, -1).join(', ') + ', or ' + values[values.length - 1];
+        }
+      }
+      
       var match = value.toString(),
           map = SetBuilder.getValueMap(key);
       if(map) {
@@ -41,8 +52,6 @@ var SetBuilder = (function() {
       } else {
         return value;
       }
-      // map = _value_maps[key];
-      // return map ? map[value.toString()] : value;
     },
     getValueMaps: function() {
       return Object.keys(_value_maps);

data/lib/set_builder/modifier/base.rb

@@ -14,6 +14,10 @@ module SetBuilder
       
       attr_reader :operator, :values
       
+      def value
+        values[0]
+      end
+      
       
       
       def valid?

data/lib/set_builder/modifiers/date_modifier.rb

@@ -64,10 +64,7 @@ module SetBuilder
         when :in_the_last
           selector.gteq(get_date)
         when :between
-          selector.between(
-            Date.parse(values[0]),
-            Date.parse(values[1])
-          )
+          selector.in(Date.parse(values[0])..Date.parse(values[1]))
         end
       end
       

data/lib/set_builder/modifiers/number_modifier.rb

@@ -21,11 +21,11 @@ module SetBuilder
       def build_conditions_for(selector)
         case operator
         when :is
-          ["#{selector}=?", format_value]
+          ["#{selector}=?", value]
         when :is_less_than
-          ["#{selector}<?", format_value]
+          ["#{selector}<?", value]
         when :is_greater_than
-          ["#{selector}>?", format_value]
+          ["#{selector}>?", value]
         when :is_between
           ["#{selector}>=? AND #{selector}<=?", values[0], values[1]]
         end
@@ -48,20 +48,6 @@ module SetBuilder
       
       
       
-    private
-      
-      
-      
-      def value
-        values[0]
-      end
-      
-      def format_value
-        value
-      end
-      
-      
-      
     end
   end
 end

data/lib/set_builder/value_map.rb

@@ -15,10 +15,19 @@ module SetBuilder
     
     
     def self.to_s(name, value)
+      if value.is_a?(Array)
+        values = value.map { |value| self.send(__method__, name, value) }
+        return case value.length
+        when 0; ""
+        when 1; values.first
+        when 2; "#{values.first} or #{values.last}"
+        else; "#{values[0..-2].join(', ')}, or #{values.last}"
+        end
+      end 
       name = name.to_sym
-      map = @registered_value_maps[name]
+      map = @registered_value_maps[name]     
       if map
-        pair = map.find {|pair| pair[0] == value}
+        pair = map.find { |pair| pair[0] == value || pair[0] == value.to_s }
         pair ? pair[1].to_s : "(unknown)"
       else
         value.to_s
@@ -59,4 +68,4 @@ module SetBuilder
   
   
   
-end
+end

data/lib/set_builder/version.rb

@@ -1,3 +1,3 @@
 module SetBuilder
-  VERSION = "1.2.0.beta2"
+  VERSION = "1.2.0.beta3"
 end

data/set_builder.gemspec

@@ -18,10 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rails"
-  spec.add_dependency "arel"
+  spec.add_dependency "rails", ">= 3.1", "< 5.0"
+  spec.add_dependency "arel", "~> 5.0"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "turn"
   spec.add_development_dependency "pry"
 end

data/test/test_helper.rb

@@ -2,7 +2,6 @@ require "rubygems"
 require "rails"
 require "rails/test_help"
 require "active_support/core_ext"
-require "turn"
 require "set_builder"
 require "pry"
 require "support/fake_connection"

metadata

@@ -1,97 +1,89 @@
 --- !ruby/object:Gem::Specification
 name: set_builder
 version: !ruby/object:Gem::Version
-  version: 1.2.0.beta2
+  version: 1.2.0.beta3
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: turn
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A gem for describing constraints on data sets
@@ -101,8 +93,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -173,17 +165,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Define traits on a model, create sets that constrain those traits, and generate