usergrid_iron 0.0.3 → 0.0.4

data/lib/usergrid/core/application.rb

@@ -54,10 +54,6 @@ module Usergrid
       self[__method__].query(query, options)
     end
 
-    def rolenames(query=nil, options={})
-      self[__method__].query(query, options).data.data.keys
-    end
-
     def counter_names
       self['counters'].get.data.data
     end

data/lib/usergrid/core/collection.rb

@@ -39,13 +39,13 @@ module Usergrid
     end
     alias_method :create_entities, :create_entity
 
-    ## options: 'reversed', 'start', 'cursor', 'limit', 'permission'
-    #def update(new_data, query=nil, options={}) # todo: enable when server is fixed
-    #  options = options.symbolize_keys
-    #  @query_params = query ? options.merge({ql: query}) : options
-    #  self.put({params: @query_params }, new_data)
-    #  self
-    #end
+    # options: 'reversed', 'start', 'cursor', 'limit', 'permission'
+    def update_query(updates, query=nil, options={})
+      options = options.symbolize_keys
+      @query_params = query ? options.merge({ql: query}) : options
+      self.put(updates, {params: @query_params })
+      self
+    end
 
     # options: 'reversed', 'start', 'cursor', 'limit', 'permission'
     def query(query=nil, options={})
@@ -59,6 +59,10 @@ module Usergrid
       entities.size
     end
 
+    def empty?
+      entities.empty?
+    end
+
     def cursor
       response.data.cursor || nil
     end

data/lib/usergrid/core/resource.rb

@@ -6,7 +6,7 @@ module Usergrid
     DEFAULT_API_URL = 'https://api.usergrid.com'
     TYPE_HEADERS = { :content_type => :json, :accept => :json }
 
-    attr_reader :current_user, :auth_token, :api_url
+    attr_reader :current_user, :api_url
 
     def initialize(resource_url=DEFAULT_API_URL, api_url=nil, options={}, response=nil)
       options[:headers] = TYPE_HEADERS.merge options[:headers] || {}
@@ -34,7 +34,7 @@ module Usergrid
     end
 
     def logged_in?
-      !!@auth_token
+      !!auth_token
     end
 
     def management
@@ -46,11 +46,18 @@ module Usergrid
       Usergrid::Application.new concat_urls(api_url, "#{organization}/#{application}"), options
     end
 
+    # options: 'reversed', 'start', 'cursor', 'limit', 'permission'
     def query(query=nil, options={})
       options = options.merge({ql: query}) if query
       get({params: options})
     end
 
+    # options: 'reversed', 'start', 'cursor', 'limit', 'permission'
+    def update_query(updates, query=nil, options={})
+      options = options.merge({ql: query}) if query
+      put(updates, {params: options})
+    end
+
     def entity
       response.entity
     end
@@ -87,16 +94,7 @@ module Usergrid
       self.response = super payload, additional_headers, &block
     end
 
-    protected
-
-    attr_reader :response
-
-    def response=(response)
-      @response = response
-    end
-
     def auth_token=(auth_token)
-      @auth_token = auth_token
       if auth_token
         @options[:headers].merge!({ Authorization: "Bearer #{auth_token}" })
       else
@@ -104,6 +102,22 @@ module Usergrid
       end
     end
 
+    def auth_token
+      begin
+        @options[:headers][:Authorization].gsub 'Bearer ', ''
+      rescue
+        nil
+      end
+    end
+
+    protected
+
+    attr_reader :response
+
+    def response=(response)
+      @response = response
+    end
+
     # add verbose debugging of response body
     def handle_response(response, request, result, &block)
       LOG.debug "response.body = #{response}"

data/lib/usergrid/extensions/response.rb

@@ -28,7 +28,7 @@ module RestClient
       entities_data = data['entities'] || data['data'] || data['messages'] || data['list']
       raise "unable to determine entities from: #{data}" unless entities_data.is_a?(Array)
       entities_data.each do |e|
-        e['uri'] = resource.concat_urls(data['uri'], e['uuid']) if e.is_a?(Hash) && e['uuid']
+        e['uri'] = concat_urls(data['uri'], e['uuid']) if e.is_a?(Hash) && e['uuid']
       end
       @entities_data = entities_data
     end
@@ -62,7 +62,20 @@ module RestClient
     end
 
     def entity
-      Usergrid::Entity.new entity_data['uri'], resource.api_url, resource.options, self
+      Usergrid::Entity.new(entity_data['uri'], resource.api_url, resource.options, self) if entity_data
     end
+
+    protected
+
+    def concat_urls(url, suburl) # :nodoc:
+      url = url.to_s
+      suburl = suburl.to_s
+      if url.slice(-1, 1) == '/' or suburl.slice(0, 1) == '/'
+        url + suburl
+      else
+        "#{url}/#{suburl}"
+      end
+    end
+
   end
 end

data/lib/usergrid/version.rb

@@ -1,3 +1,3 @@
 module Usergrid
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/spec_helper.rb

@@ -17,9 +17,14 @@ SimpleCov.start
 
 SPEC_SETTINGS = YAML::load_file(File.join File.dirname(__FILE__), 'spec_settings.yaml')
 
+def login_management
+  management = Usergrid::Resource.new(SPEC_SETTINGS[:api_url]).management
+  management.login SPEC_SETTINGS[:organization][:username], SPEC_SETTINGS[:organization][:password]
+  management
+end
+
 # ensure we are correctly setup (management login & organization)
-management = Usergrid::Resource.new(SPEC_SETTINGS[:api_url]).management
-management.login SPEC_SETTINGS[:management][:username], SPEC_SETTINGS[:management][:password]
+management = login_management
 
 begin
   management.create_organization(SPEC_SETTINGS[:organization][:name],
@@ -36,14 +41,6 @@ rescue
   end
 end
 
-def app_endpoint
-  "#{SPEC_SETTINGS[:organization][:name]}/#{SPEC_SETTINGS[:application][:name]}"
-end
-
-def org_endpoint
-  "#{SPEC_SETTINGS[:organization][:name]}"
-end
-
 def create_random_application
   management = login_management
   organization = management.organization SPEC_SETTINGS[:organization][:name]
@@ -56,7 +53,7 @@ end
 def delete_application(application)
   management = login_management
   application.auth_token = management.auth_token
-  application.delete
+  application.delete rescue nil  # not implemented on server yet
 end
 
 def create_random_user(application, login=false)
@@ -69,9 +66,3 @@ def create_random_user(application, login=false)
   application.login user_hash[:username], user_hash[:password] if login
   entity
 end
-
-def login_management
-  management = Usergrid::Resource.new(SPEC_SETTINGS[:api_url]).management
-  management.login SPEC_SETTINGS[:organization][:username], SPEC_SETTINGS[:organization][:password]
-  management
-end

data/spec/usergrid/core/application_spec.rb

@@ -201,20 +201,7 @@ describe Usergrid::Application do
     response = @application.counter 'test'
     counter = response.data.counters.first
     counter.name.should eq 'test'
-    counter.values.last.first.value.should eq 2
-  end
-
-  it "should be able to create, retrieve, and delete roles via rolenames" do
-    size = @application.rolenames.size
-
-    role_name = "test-#{SecureRandom.hex}"
-    @application.create_entity :rolenames, name: role_name
-    role_names = @application.rolenames
-    role_names.size.should eq size+1
-    role_names.should include role_name
-
-    @application['rolenames'][role_name].delete
-    @application.rolenames.size.should eq size
+    counter.values.last.first.value.should be > 0
   end
 
   it "should be able to create, retrieve, and delete roles" do

data/spec/usergrid/core/collection_spec.rb

@@ -71,12 +71,12 @@ describe Usergrid::Collection do
     @collection[0].name.should eq @entity_data[2][:name]
   end
 
-  #it "should be able to update based on a query" do # todo: enable when server is fixed
-  #  @collection.update({new_field: 'new_value'}, "select * where name = \'#{@entity_data[4][:name]}\'")
-  #  @collection.query
-  #  entity = @collection.detect { |e| e.new_field == 'new_value' }
-  #  entity.should_not be_nil
-  #  entity.name.should eq @entity_data[4][:name]
-  #end
+  it "should be able to update based on a query" do
+    @collection.update_query({new_field: 'new_value'}, "select * where name = \'#{@entity_data[4][:name]}\'")
+    @collection.query
+    entity = @collection.detect { |e| e['new_field'] == 'new_value' }
+    entity.should_not be_nil
+    entity.name.should eq @entity_data[4][:name]
+  end
 
 end

data/spec/usergrid/core/entity_spec.rb

@@ -42,4 +42,8 @@ describe Usergrid::Entity do
     empty.data?.should be_false
   end
 
+  it "should return nil if empty result" do
+    @application['foobars'].get.entity.should be_nil
+  end
+
 end

data/spec/usergrid/core/resource_spec.rb

@@ -18,6 +18,7 @@ describe Usergrid::Resource do
   end
 
   it "should fail with a 401 when lacking auth" do
+    app_endpoint = "#{SPEC_SETTINGS[:organization][:name]}/#{SPEC_SETTINGS[:application][:name]}"
     expect { @resource[app_endpoint].get }.to raise_error(RestClient::Unauthorized) { |exception|
       exception.response.code.should eq 401
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usergrid_iron
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -149,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -270819572663973399
+      hash: 1515715500160031430
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -270819572663973399
+      hash: 1515715500160031430
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24