lorj_cloud 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 117a39e2598d4263f58768a8511b41748bb1fdae
-  data.tar.gz: 6d6b42bb3e7d2d4b68e5e7e0e23b2ae17e813a16
+  metadata.gz: 17e1978b46981170cb2e2395ccad5200e921eda6
+  data.tar.gz: a0dc7fbd515419b4ee1a7ac1869324352b67d044
 SHA512:
-  metadata.gz: 2b8e84fca2d746bfcf44247ddf0254c05aa18b781bb097b0b3f854e38384f85655391766707d771b05b5802ee719dafe18b8d6dad480ee552ced2f3063e0aeb0
-  data.tar.gz: 552715dbf1cd40919058b2572ea01f639fb91b5a220d6ce773caf891072745aa37e17cd4610319178e78b232a2c6bacfd9a4b8ddf40b6f61dbe9693d00e72d02
+  metadata.gz: 5f86a3b5662a3aa1828e8946e7c5ed85450a39854a97f83c1b485d26bc98568c05c440ebf6c75ed7ed81a4888dc8d6d92f4488228dccba92dd00eefddd5c6284
+  data.tar.gz: cac7a6ea085ab03798e9aa7223b496a72a48aeba442550ab3459a6ddebf3fb247effe3b02651201db8b4c429f1554b379ee8398fbd10193c20aad8f51c1e9064

data/lib/lorj_cloud/version.rb

@@ -1,5 +1,5 @@
 # LorjCloud module
 module LorjCloud
-  VERSION = '0.1.4'
-  DATE = '2015-06-24'
+  VERSION = '0.1.5'
+  DATE = '2015-06-25'
 end

data/lib/lorj_cloud.rb

@@ -3,4 +3,4 @@ require 'lorj_cloud/version'
 require 'lorj'
 
 Lorj.declare_process('cloud', File.dirname(__FILE__),
-                     :controllers_dir => 'providers')
+                     :controllers_dir => 'providers', :lib_name => 'lorj_cloud')

data/lib/process/cloud/providers/hpcloud/hpcloud_query.rb

@@ -33,18 +33,35 @@ class HpcloudController
       yield hParams, query if block_given?
 
       func = hParams[connection].send(property_name).method(:all)
+      objects = _compat_query(func, __method__, query)
+      # Uses :[] or :<key> to match object and query attr.
+      Lorj.debug(4, "'%s' gets %d records", __method__, objects.length)
+      ctrl_query_each objects, query # Return the select objects.
+    end
+  end
+
+  def _compat_query(func, cur_method, query)
+    # Ruby 1.9.2 introduce Method.parameters.
+    if RUBY_VERSION < '1.9.2'
+      Lorj.debug(4, "RUBY '%s': '%s' try Openstack API filter feature.",
+                 RUBY_VERSION, cur_method)
+      begin
+        objects = func.call ctrl_query_select(query, String)
+      rescue
+        Lorj.debug(4, "RUBY '%s': '%s' No filter parameter.",
+                   RUBY_VERSION, cur_method)
+        objects = func.call
+      end
+    else
       if func.parameters.length > 0
-        Lorj.debug(4, "'%s' uses HPCloud API filter feature.", __method__)
+        Lorj.debug(4, "'%s' uses Openstack API filter feature.", cur_method)
         objects = func.call ctrl_query_select(query, String)
       else
         objects = func.call
       end
-      # Uses :[] or :<key> to match object and query attr.
-      Lorj.debug(4, "'%s' gets %d records", __method__, objects.length)
-      ctrl_query_each objects, query # Return the select objects.
     end
+    objects
   end
-
   def_query :compute_connection, :tenant
 
   def_query :compute_connection, :image

data/lorj_cloud.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.9"
+  spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.1.0"
 
-  spec.add_runtime_dependency "lorj", ">= 1.0.13"
+  spec.add_runtime_dependency "lorj", ">= 1.0.15"
   spec.add_runtime_dependency 'subhash', '>= 0.1.3'
   spec.add_runtime_dependency "fog", "~> 1.30.0"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lorj_cloud
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Christophe Larsonneur
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.13
+        version: 1.0.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.13
+        version: 1.0.15
 - !ruby/object:Gem::Dependency
   name: subhash
   requirement: !ruby/object:Gem::Requirement