dao 5.5.0 → 5.5.1

data/Rakefile

@@ -32,7 +32,7 @@ def run_tests!(which = nil)
 
   test_rbs.each_with_index do |test_rb, index|
     testno = index + 1
-    command = "#{ This.ruby } -w -I ./lib -I ./test/lib #{ test_rb }"
+    command = "#{ This.ruby } -I ./lib -I ./test/lib #{ test_rb }"
 
     puts
     say(div, :color => :cyan, :bold => true)

data/a.rb

@@ -0,0 +1,7 @@
+require 'dao'
+
+form = Dao::Form.new(Map.for(:name => 'key'))
+
+key = form.key_for(:a, '{{ i }}', :b, '{{ j }}')
+
+p key

data/dao.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "dao"
-  spec.version = "5.5.0"
+  spec.version = "5.5.1"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "dao"
   spec.description = "presenter, conducer, api, and better form objects for you rails' pleasure"
@@ -14,6 +14,7 @@ Gem::Specification::new do |spec|
  "Gemfile.lock",
  "README",
  "Rakefile",
+ "a.rb",
  "dao.gemspec",
  "lib",
  "lib/dao",
@@ -85,6 +86,8 @@ Gem::Specification::new do |spec|
  "lib/dao/validations/common.rb",
  "lib/dao/validations/instance.rb",
  "lib/dao/validations/validator.rb",
+ "notes",
+ "notes/ara.txt",
  "test",
  "test/active_model_conducer_lint_test.rb",
  "test/api_test.rb",

data/lib/dao.rb

@@ -11,7 +11,7 @@
 # dao libs
 #
   module Dao
-    Version = '5.5.0' unless defined?(Version)
+    Version = '5.5.1' unless defined?(Version)
 
     def version
       Dao::Version

data/lib/dao/conducer/controller_support.rb

@@ -28,6 +28,11 @@ module Dao
         @controller.send(:request) if @controller
       end
 
+      def request_method
+        method = request.try(:method)
+        method ? method.to_s.to_sym.upcase : nil
+      end
+
     ##
     #
       class Action < ::String

data/lib/dao/support.rb

@@ -120,6 +120,9 @@ module Dao
 
         paths_and_values.each do |path, value|
           keys = keys_for(path)
+          if map.has?(keys)
+            inc_keys!(keys)
+          end
           map.set(keys => value)
         end
 
@@ -141,9 +144,24 @@ module Dao
       digity ? stringy ? String(digits) : Integer(digits) : key
     end
   end
-
   alias_method(:key_for, :keys_for)
 
+  def inc_keys!(keys)
+    last_number_index = nil
+
+    keys.each_with_index do |k, i|
+      if k.is_a?(Number)
+        last_number_index = i
+      end
+    end
+
+    if last_number_index
+      keys[last_number_index] = keys[last_number_index] + 1
+    end
+
+    keys
+  end
+
   def render_json(object, options = {})
     options = options.to_options!
     controller = options[:controller] || Dao.current_controller

data/notes/ara.txt

@@ -0,0 +1,11 @@
+todo:
+
+  - rack parameter encoding or safe array parsing
+
+  - kill api layer?
+
+  - conducer document
+    - def prepare // lifecycle changes
+
+
+done:

data/test/form_test.rb

@@ -52,7 +52,7 @@ Testing Dao::Form do
     assert do
       scmp(
         html,
-        '<select name="dao[form][key]" class="dao" id="form_key"/>'
+        '<select name="dao[form][key]" class="dao" id="form_key"> </select>'
       )
     end
 

data/test/support_test.rb

@@ -33,6 +33,8 @@ Testing Dao::Conducer do
 
     assert{ Dao.normalize_parameters(params) }
 
+#require 'pry'
+#binding.pry
     assert{ params[:foos].is_a?(Hash) }
     assert{ params[:foos][:k] == 'v' }
     assert{ params[:foos][:array] == %w( 0 1 ) }

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: dao
 version: !ruby/object:Gem::Version
-  version: 5.5.0
+  version: 5.5.1
+  prerelease: 
 platform: ruby
 authors:
 - Ara T. Howard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2016-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: map
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fattr
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: coerce
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: tagz
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: wrap
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails_current
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -139,6 +158,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails_errors2html
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -146,6 +166,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -160,6 +181,7 @@ files:
 - Gemfile.lock
 - README
 - Rakefile
+- a.rb
 - dao.gemspec
 - lib/dao.rb
 - lib/dao/active_record.rb
@@ -219,6 +241,7 @@ files:
 - lib/dao/validations/common.rb
 - lib/dao/validations/instance.rb
 - lib/dao/validations/validator.rb
+- notes/ara.txt
 - test/active_model_conducer_lint_test.rb
 - test/api_test.rb
 - test/conducer_test.rb
@@ -233,25 +256,27 @@ files:
 homepage: https://github.com/ahoward/dao
 licenses:
 - same as ruby's
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: codeforpeople
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: dao
 test_files: []
+has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODJiYmNmMGY2MDdkYjM1MThiOTUyOGFkMzc5ZDkwMTNhYjA1YjNhYw==
-  data.tar.gz: !binary |-
-    YzRmOWI5Y2ViYjM0NjM5MWFiMDYzZjFhMjEwYjNkMjJkMTJlNmY1Mw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YzU1M2Y0NWM5MGU2OWI0NTU5MGFlOGQzZWI0MjRkNzEwZTllZGRmMDJkOGNk
-    ZjhlNjAzZjc4OWFmM2M5YjhmMTNlNWVhMWMxNWFhOTgwZTQ4MDdlYTg1MGY0
-    YmY5NWI5N2E0NjYzZmM4NjA5ZDYwNWYyYmI5Zjk4NWJiZTNiOTg=
-  data.tar.gz: !binary |-
-    YTc5NDY5OTBlYjA1MWRjZjA3MjI5MzliOTlhNzQ1MTljZjc3NGJiMjFhY2Y0
-    ZjJjYmQxN2RmZmViMDEzMjlhOWE5ZDEwODVlOTUwMmUwMGE3ZWZiMzEwZDkw
-    ZjdlNGFkMjJmN2JmZWZhZTg0N2U1ZDUyMWEwMGY4ZDJmMDJlYjg=