consul 0.11.0 → 0.11.1

data/.gitignore

@@ -4,3 +4,4 @@ pkg
 .idea
 *.db
 app_root/log/*
+.bundle

data/.travis.yml

@@ -11,3 +11,4 @@ notifications:
 branches:
   only:
     - master
+    - travis-testing

data/Rakefile

@@ -31,7 +31,9 @@ namespace :all do
   desc "Bundle all spec apps"
   task :bundle do
     for_each_directory_of('spec/**/Gemfile') do |directory|
-      system("cd #{directory} && bundle install")
+      Bundler.with_clean_env do
+        system("cd #{directory} && bundle install")
+      end
     end
   end
 

data/lib/consul/errors.rb

@@ -6,4 +6,5 @@ module Consul
   class UnreachablePower < Error; end
   class NoCollection < Error; end
   class MissingContext < Error; end
+  class PowerNotSingularizable < Error; end
 end

data/lib/consul/power.rb

@@ -59,6 +59,12 @@ module Consul
       # spy for tests
     end
 
+    def singularize_power_name(name)
+      self.class.singularize_power_name(name)
+    end
+
+
+
     module ClassMethods
       include Consul::Power::DynamicAccess::ClassMethods
 
@@ -108,8 +114,12 @@ module Consul
         else
           define_method(name, &block)
           define_query_and_bang_methods(name) { |*args| default_include_power?(name, *args) }
-          if name.singularize != name
-            define_query_and_bang_methods(name.singularize) { |*args| default_include_object?(name, *args) }
+          begin
+            singular = singularize_power_name(name)
+            define_query_and_bang_methods(singular) { |*args| default_include_object?(name, *args) }
+          rescue Consul::PowerNotSingularizable
+            # We do not define singularized power methods if it would
+            # override the collection method
           end
           ids_method = power_ids_name(name)
           define_method(ids_method) { |*args| default_power_ids(name, *args) }
@@ -118,6 +128,16 @@ module Consul
         name
       end
 
+      def singularize_power_name(name)
+        name = name.to_s
+        singularized = name.singularize
+        if singularized == name
+          raise Consul::PowerNotSingularizable, "Power name can not have an singular form: #{name}"
+        else
+          singularized
+        end
+      end
+
     end
   end
 end

data/lib/consul/power/dynamic_access.rb

@@ -5,7 +5,7 @@ module Consul
       module InstanceMethods
 
         def include?(power_name, *args)
-          warn "#include? ist deprececated. Use #include_power? and #include_object? instead."
+          warn "makandra/consul: #include? is deprececated. Use #include_power? and #include_object? instead."
           if args.size == 0
             include_power?(power_name, *args)
           else
@@ -14,7 +14,7 @@ module Consul
         end
 
         def include!(power_name, *args)
-          warn "#include! ist deprececated. Use #include_power! and #include_object! instead."
+          warn "makandra/consul: #include! is deprececated. Use #include_power! and #include_object! instead."
           if args.size == 0
             include_power!(power_name, *args)
           else
@@ -32,12 +32,12 @@ module Consul
 
         def include_object?(power_name, *context_and_object)
           power_name = power_name.to_s
-          send("#{power_name.singularize}?", *context_and_object)
+          send("#{singularize_power_name(power_name)}?", *context_and_object)
         end
 
         def include_object!(power_name, *context_and_object)
           power_name = power_name.to_s
-          send("#{power_name.singularize}!", *context_and_object)
+          send("#{singularize_power_name(power_name)}!", *context_and_object)
         end
 
         def for_record(*args)

data/lib/consul/version.rb

@@ -1,3 +1,3 @@
 module Consul
-  VERSION = '0.11.0'
+  VERSION = '0.11.1'
 end

data/spec/rails-2.3/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'assignable_values'
 gem 'rails', '~>2.3'
@@ -7,7 +7,6 @@ gem 'rspec-rails', '~>1.3'
 gem 'shoulda-matchers', '<2'
 gem 'sqlite3'
 gem 'rspec_candy'
-gem 'ruby-debug', :platforms => :mri_18
 gem 'test-unit', '~>1.2', :platforms => :ruby_19
 gem 'hoe', '=2.8.0', :platforms => :ruby_19
 

data/spec/rails-2.3/Gemfile.lock

@@ -7,7 +7,7 @@ PATH
       rails
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     actionmailer (2.3.18)
       actionpack (= 2.3.18)
@@ -21,13 +21,10 @@ GEM
     activesupport (2.3.18)
     assignable_values (0.7.1)
       activerecord
-    columnize (0.3.6)
     edge_rider (0.2.3)
       activerecord
     hoe (2.8.0)
       rake (>= 0.8.7)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
     memoizer (1.0.1)
     rack (1.1.6)
     rails (2.3.18)
@@ -38,7 +35,6 @@ GEM
       activesupport (= 2.3.18)
       rake (>= 0.8.3)
     rake (10.0.4)
-    rbx-require-relative (0.0.9)
     rspec (1.3.2)
     rspec-rails (1.3.4)
       rack (>= 1.0.0)
@@ -46,11 +42,6 @@ GEM
     rspec_candy (0.2.9)
       rspec
       sneaky-save
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
     shoulda-matchers (1.0.0)
     sneaky-save (0.0.2)
       activerecord (>= 2.3.2)
@@ -69,7 +60,6 @@ DEPENDENCIES
   rspec (~> 1.3)
   rspec-rails (~> 1.3)
   rspec_candy
-  ruby-debug
   shoulda-matchers (< 2)
   sqlite3
   test-unit (~> 1.2)

data/spec/rails-3.0/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'assignable_values'
 gem 'rails', '~>3.0.17'
@@ -7,6 +7,5 @@ gem 'rspec-rails'
 gem 'shoulda-matchers', '<2'
 gem 'sqlite3'
 gem 'rspec_candy'
-gem 'ruby-debug', :platforms => :mri_18
 
 gem 'consul', :path => '../..'

data/spec/rails-3.0/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: ../..
   specs:
-    consul (0.10.2)
+    consul (0.11.0)
       edge_rider
       memoizer
       rails
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     abstract (1.0.0)
     actionmailer (3.0.20)
@@ -42,7 +42,6 @@ GEM
     bourne (1.4.0)
       mocha (~> 0.13.2)
     builder (2.1.2)
-    columnize (0.3.6)
     diff-lcs (1.2.4)
     edge_rider (0.2.3)
       activerecord
@@ -50,8 +49,6 @@ GEM
       abstract (>= 1.0.0)
     i18n (0.5.0)
     json (1.8.0)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
     mail (2.2.20)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -83,7 +80,6 @@ GEM
       rdoc (~> 3.4)
       thor (~> 0.14.4)
     rake (10.0.4)
-    rbx-require-relative (0.0.9)
     rdoc (3.12.2)
       json (~> 1.4)
     rspec (2.13.0)
@@ -104,11 +100,6 @@ GEM
     rspec_candy (0.2.9)
       rspec
       sneaky-save
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
     shoulda-matchers (1.5.6)
       activesupport (>= 3.0.0)
       bourne (~> 1.3)
@@ -131,6 +122,5 @@ DEPENDENCIES
   rspec
   rspec-rails
   rspec_candy
-  ruby-debug
   shoulda-matchers (< 2)
   sqlite3

data/spec/rails-3.0/spec/spec_helper.rb

@@ -4,7 +4,7 @@ $: << File.join(File.dirname(__FILE__), "/../../lib" )
 ENV['RAILS_ENV'] ||= 'test'
 ENV['RAILS_ROOT'] = 'app_root'
 
-FileUtils.rm(Dir.glob("db/*.db"), :force => true)
+FileUtils.rm(Dir.glob("app_root/db/*.db"), :force => true)
 
 # Load the Rails environment and testing framework
 require "#{File.dirname(__FILE__)}/../app_root/config/environment"

data/spec/rails-3.2/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'assignable_values'
 gem 'rails', '~>3.2.0'
@@ -7,6 +7,5 @@ gem 'rspec-rails'
 gem 'shoulda-matchers', '<2'
 gem 'sqlite3'
 gem 'rspec_candy'
-gem 'ruby-debug', :platforms => :mri_18
 
 gem 'consul', :path => '../..'

data/spec/rails-3.2/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: ../..
   specs:
-    consul (0.10.2)
+    consul (0.11.0)
       edge_rider
       memoizer
       rails
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     actionmailer (3.2.13)
       actionpack (= 3.2.13)
@@ -42,7 +42,6 @@ GEM
     bourne (1.4.0)
       mocha (~> 0.13.2)
     builder (3.0.4)
-    columnize (0.3.6)
     diff-lcs (1.2.4)
     edge_rider (0.2.3)
       activerecord
@@ -51,8 +50,6 @@ GEM
     i18n (0.6.1)
     journey (1.0.4)
     json (1.8.0)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -86,7 +83,6 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (10.0.4)
-    rbx-require-relative (0.0.9)
     rdoc (3.12.2)
       json (~> 1.4)
     rspec (2.13.0)
@@ -107,11 +103,6 @@ GEM
     rspec_candy (0.2.9)
       rspec
       sneaky-save
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
     shoulda-matchers (1.5.6)
       activesupport (>= 3.0.0)
       bourne (~> 1.3)
@@ -140,6 +131,5 @@ DEPENDENCIES
   rspec
   rspec-rails
   rspec_candy
-  ruby-debug
   shoulda-matchers (< 2)
   sqlite3

data/spec/rails-3.2/spec/spec_helper.rb

@@ -3,7 +3,7 @@ $: << File.join(File.dirname(__FILE__), "/../../lib" )
 ENV['RAILS_ENV'] ||= 'test'
 ENV['RAILS_ROOT'] = 'app_root'
 
-FileUtils.rm(Dir.glob("db/*.db"), :force => true)
+FileUtils.rm(Dir.glob("app_root/db/*.db"), :force => true)
 
 # Load the Rails environment and testing framework
 require "#{File.dirname(__FILE__)}/../app_root/config/environment"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: consul
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 11
-  - 0
-  version: 0.11.0
+  - 1
+  version: 0.11.1
 platform: ruby
 authors: 
 - Henning Koch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-12-18 00:00:00 +01:00
+date: 2014-02-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency