valuable 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bbc18a2b139f32386397c81db9c218fb26c6d31
-  data.tar.gz: b8fc0a4cdf580799818d8bfa9c012e2c8f2991ea
+  metadata.gz: 2a60fe8e5d0483aaf30741b88d9402e5953bb880
+  data.tar.gz: 3563930067b4046a967e1c295504f71ac80ed2c4
 SHA512:
-  metadata.gz: 943a75a3b565042af7171d14e78264076cb27af3e71c3d263dae2e5946a0009fad12995aba3e44a83c34e1d5325e3e340370eac68221c6b96db159bc23ce941b
-  data.tar.gz: 2cf6bc7310fbcc1c2b6c4d8932eebd27f22f1acac12b68a88220cc7cb9559f6b8747df66256b60fbefa96624ec4a3cf91952603d3051212950d4498c75bb8aaf
+  metadata.gz: d934ef17cc0bb98b12684e9d23e41adc4320898683d03f70170c52b5b38d56ce676c0608c2574c8db4a8e140c681c54b638468294e2299c4f5db3214ab08c48b
+  data.tar.gz: a73e26d8ffe8c50e1d971e7c5ec8c95a1708ae33abada1d2eedfdd18bbbc4099555999045fdbd53bc4acce43f88b84f4dc108641a95f768a0816f3ce581f0daf

data/examples/search-medium.rb

@@ -0,0 +1,57 @@
+class CustomerSearch < Valuable
+  # BE AWARE OF SQL INJECTION!!!
+
+  has_value :last_name
+  has_value :first_name
+  has_value :zipcode
+  has_value :partner_id, :klass => :integer
+
+  def terms
+    # With truly simple cases, you can just use `attributes` for this
+
+    terms = {}
+    terms[:zipcode] = self.zipcode
+    terms[:last_name_like] = "%#{self.last_name}%" if self.last_name
+    terms[:first_name_like] = "%#{self.first_name}%" if self.first_name
+    terms[:partner_id] = self.partner_id if self.partner_id
+    terms
+  end
+
+  def joins
+    out = []
+    out << [:location] if self.zipcode
+    out << [:identifiers] if self.partner_id
+    out
+  end
+
+  def conditions
+    out = []
+
+    unless self.last_name.blank?
+      out << "customers.last_name like :last_name_like"
+    end
+
+    unless self.first_name.blank?
+      out << "customers.first_name like :first_name_like";
+    end
+
+    unless self.zipcode.blank?
+      out << "locations.zipcode = :zipcode"
+    end
+
+    unless self.partner_id.blank?
+      out << "customer_identifiers.partner_id = :partner_id"
+    end
+
+    if( out.not.empty? )
+      [out.join(' and '), terms]
+    else
+      nil
+    end
+  end
+
+  def results
+    Customer.joins(joins).where(conditions).includes([:location]).order('customers.id
+ desc')
+  end
+end

data/examples/search-simple.rb

@@ -0,0 +1,29 @@
+class CustomerHistorySearch < Valuable
+  has_value :customer_id, klass: :integer
+  has_value :client_id, klass: :integer
+
+  def results
+    if client_id && customer_id
+      (
+        ServiceOrder.where(
+           customer_id: customer_id,
+           client_id: client_id
+        ) + 
+        SalesOrder.where(
+          customer_id: customer_id,
+          client_id: client_id
+        )
+      ).sort_by(&:created_at)
+    elsif customer_id
+      (
+        ServiceOrder.where(
+          customer_id: customer_id
+        ) +
+        PreQ.where(
+          customer_id: customer_id
+        )
+      ).sort_by(&:created_at)
+    end
+  end
+end
+

data/lib/valuable.rb

@@ -158,6 +158,7 @@ class Valuable
       Valuable::Utils.check_options_validity(self.class.name, name, options)
 
       options[:extend] = [options[:extend]].flatten.compact
+      options[:allow_blank] = options.has_key?(:allow_blank) ? options[:allow_blank] : true
 
       name = name.to_sym
       _attributes[name] = options 
@@ -167,7 +168,7 @@ class Valuable
       create_question_for(name) if options[:klass] == :boolean
       create_negative_question_for(name, options[:negative]) if options[:klass] == :boolean && options[:negative]
       
-      create_setter_for(name)
+      create_setter_for(name, allow_blank: options[:allow_blank] )
 
       sudo_alias options[:alias], name if options[:alias]
       sudo_alias "#{options[:alias]}=", "#{name}=" if options[:alias]
@@ -188,13 +189,14 @@ class Valuable
     # >> player.attributes[:phone] = "8778675309"
     # >> player.phone
     # => "8778675309"
-    def create_setter_for(attribute)
+    def create_setter_for(attribute, options)
       setter_method = "#{attribute}="
 
       define_method setter_method do |value|
-        write_attribute(attribute, value)
+        if options[:allow_blank] || value != ""
+          write_attribute(attribute, value)
+        end
       end
-
     end
 
     def sudo_alias( alias_name, method_name )
@@ -289,7 +291,7 @@ class Valuable
       _attributes[name] = options 
       
       create_accessor_for(name, options[:extend])
-      create_setter_for(name)
+      create_setter_for(name, allow_blank: false)
 
       sudo_alias options[:alias], name if options[:alias]
       sudo_alias "#{options[:alias]}=", "#{name}=" if options[:alias]

data/lib/valuable/utils.rb

@@ -114,7 +114,7 @@ module Valuable::Utils
     end
 
     def known_options
-      [:klass, :default, :negative, :alias, :parse_with, :extend]
+      [:klass, :default, :negative, :alias, :parse_with, :extend, :allow_blank]
     end
 
     # this helper raises an exception if the options passed to has_value

data/test/typical_test.rb

@@ -61,5 +61,13 @@ class TypicalTest < Test::Unit::TestCase
   def test_that_it_uses_the_default_collection
     assert_equal Person.new.dreams, [:happiness, :respect]
   end
+
+  def test_that_we_can_prevent_blanks
+    device = Class.new(Valuable)
+    device.has_value( :battery_percent, :allow_blank => false )
+
+    cell = device.new(:battery_percent => '')
+    assert_equal( nil, cell.battery_percent )
+  end
 end
 

data/valuable.version

@@ -1 +1 @@
-0.9.10
+0.9.11

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valuable
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - Johnathon Wright
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-04-13 00:00:00.000000000 Z
 dependencies: []
 description: Valuable is a ruby base class that is essentially attr_accessor on steroids.
   A simple and intuitive interface allows you to get on with modeling in your app.
@@ -28,6 +28,8 @@ files:
 - examples/person.rb
 - examples/phone_number.rb
 - examples/rails_presenter.rb
+- examples/search-medium.rb
+- examples/search-simple.rb
 - lib/valuable.rb
 - lib/valuable/utils.rb
 - test/alias_test.rb