sentimeta 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a11776a8666b48bfd302b9cdec9483a268eef114
-  data.tar.gz: 6a13baf8f7370768a8d6d18acdc8a0ab414c7220
+  metadata.gz: 431cbeb69e0bf92505b1bf5687050247e9292233
+  data.tar.gz: da305f3372a3c2686abd905938102c339cf06a84
 SHA512:
-  metadata.gz: c674d811c2ede6c546856e20f8b5cac41251a3572c96af97a2c0c0ef3288f5a41b8e0679623bcd30d72aca9e869cd99f708acd2452302889284cadfff73d9c36
-  data.tar.gz: 2807c37d1e134f3e70c8b02fcae9f5df3cc8d03be631fcb0ed0d55e24650763ebcfb41a6f5946cf9080b6efda4e7edb71cbfc93e20a0fa80ab86937d8085cd84
+  metadata.gz: 45be246f83d067969cda6a4cb8e25be9c786308235543434d77d35777b3b5e4d8ce38f1a4099206443b49a67f0b6f3bb50b5f2cbc0c6a0d645cd9612571855c2
+  data.tar.gz: 4578f03407e0a64cc73c5249dfe8e4269f4d9e861a60f0fe37ab4b8c99bf82bc281d10c69c0712109a6f1e2d820b650e2064963913a6298c56f9c90545883922

data/.gitignore

@@ -3,3 +3,4 @@
 .bundle
 Gemfile.lock
 pkg
+fixtures

data/lib/sentimeta/client/auth.rb

@@ -2,19 +2,33 @@ module Sentimeta::Client::Auth
   extend self
   extend Sentimeta::RestClient
 
-  def namespace
-    :auth
-  end
+  self.namespace = 'crowd/auth'
 
   def user token
-    get :users, id: token
+    get 'users/token', id: token
   end
 
   def signup attrs
-    post :users, user: attrs
+    post :signup, attrs
   end
 
   def signin attrs
-    post :sessions, user: attrs
+    post :signin, attrs
+  end
+
+  def reset_password_token login
+    put 'users/create_reset_token', login: login
+  end
+
+  def reset_password params
+    put 'users/reset_password', params
+  end
+
+  def oauth attrs
+    post :oauth, attrs
+  end
+
+  def signout token
+    delete 'users/token', id: token
   end
 end

data/lib/sentimeta/client/data.rb

@@ -1,6 +1,9 @@
 module Sentimeta::Client::Data
   extend self
   extend Sentimeta::RestClient
+
+  def sphere() Sentimeta.sphere end
+
   
   %i(criteria spheres objects catalog).each do |endpoint|
     define_method endpoint do |options={}|

data/lib/sentimeta/rest_client.rb

@@ -2,26 +2,29 @@ require 'json'
 require "colorize"
 require "rest_client"
 
-
 module Sentimeta
   module RestClient
     require "sentimeta/error/unreachable"
     # require "sentimeta/error/record_not_found"
 
+    attr_accessor :namespace
+    
 
     class ApiResponse
       attr_accessor :status, :body
 
       def initialize response
         self.status = response.code
-        self.body   = JSON.parse(response)
+        self.body   = JSON.parse(response) rescue nil
       end
 
       def ok?
         status < 300
       end
 
-      delegate :[], to: :body
+      def [] key
+        body[key] if body.respond_to?(:[])
+      end
     end
 
 
@@ -59,14 +62,11 @@ module Sentimeta
       end
     end
 
-
-    private
-
     def generate_uri endpoint, options={}
       [].tap do |components|
         components << Sentimeta.endpoint
-        components << (options.delete(:sphere) || Sentimeta.sphere) unless endpoint == :spheres
-        components << namespace if respond_to?(:namespace)
+        components << (options.delete(:sphere) || try(:sphere)) unless endpoint == :spheres
+        components << namespace unless namespace.nil? 
         components << endpoint
         components << options.delete(:filter) if endpoint == :attributes  # TODO remove
         components << options.delete(:provider) if endpoint == :prices    # TODO remove

data/lib/sentimeta/support.rb

@@ -0,0 +1,74 @@
+class Object
+  def try(*a, &b)
+    if a.empty? && block_given?
+      yield self
+    else
+      public_send(*a, &b) if respond_to?(a.first)
+    end
+  end
+end
+
+class String
+  def blank?
+    strip == ''
+  end
+
+  def present?
+    !blank?
+  end
+end
+
+class Array
+  def blank?
+    empty?
+  end
+  def empty?
+    self == []
+  end
+
+  def present?
+    !empty?
+  end
+end
+
+class Fixnum
+  def present?
+    true
+  end
+
+  def blank?
+    false
+  end
+end
+
+class NilClass
+  def present?
+    false
+  end
+
+  def blank?
+    true
+  end
+
+  def empty?
+    true
+  end
+end
+
+class Hash
+  def present?
+    !blank?
+  end
+
+  def blank?
+    empty?
+  end
+
+  def symbolize_keys
+    self.inject({}){|rslt, (k, v)| rslt.merge(k.to_sym => v) }
+  end
+
+  def reverse_merge(hash)
+    hash.merge self
+  end
+end

data/lib/sentimeta/version.rb

@@ -1,3 +1,3 @@
 module Sentimeta
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/sentimeta.rb

@@ -13,5 +13,6 @@ require "sentimeta/client"
 require "sentimeta/observers"
 require "sentimeta/model"
 require "sentimeta/logger"
+require "sentimeta/support"
 require "sentimeta/railtie" if defined? Rails
 require "sentimeta/init"

data/sentimeta.gemspec

@@ -17,5 +17,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rake", "~> 10.4"
   s.add_development_dependency "rspec", "~> 3.1"
-  s.add_development_dependency "fakeweb", "~> 1.3"
+  s.add_development_dependency "webmock", "~> 1.20"
+  s.add_development_dependency "vcr", "~> 2.9.3"
+
 end

data/spec/client_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Sentimeta::Client do
+describe Sentimeta::Client, :vcr do
 
   subject { Sentimeta::Client }
 
@@ -13,21 +13,21 @@ describe Sentimeta::Client do
 
 
   describe :generate_uri do
-    it "should return an instance of URI" do
-      expect(valid_url).to be_kind_of URI
+    it "should return an instance of String" do
+      expect(valid_url).to be_kind_of String
     end
   end
 
 
-  describe :send_request do
-    it "should be fine for a valid uri" do
-      expect { subject.send_request valid_url }.not_to raise_error
-    end
+  # describe :send_request do
+  #   it "should be fine for a valid uri" do
+  #     expect { subject.send_request valid_url }.not_to raise_error
+  #   end
 
-    it "should raise an error for invalid uri" do
-      expect { subject.send_request "invalid" }.to raise_error Sentimeta::Error::Unreachable
-    end
-  end
+  #   it "should raise an error for invalid uri" do
+  #     expect { subject.send_request "invalid" }.to raise_error Sentimeta::Error::Unreachable
+  #   end
+  # end
 
 
   describe :endpoints do
@@ -44,9 +44,9 @@ describe Sentimeta::Client do
       end
     end
 
-    it { should respond_to :prices }
-    it("#prices should call fetch once") { pending }
-    it("#prices should return an array") { pending }
+    # it { should respond_to :prices }
+    # it("#prices should call fetch once") { pending }
+    # it("#prices should return an array") { pending }
   end
 
 end

data/spec/model_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Sentimeta::Model do
+describe Sentimeta::Model, :vcr do
 
   subject(:client) { Sentimeta::Client }
   subject { model = Sentimeta::Model; model.endpoint :spheres; model }

data/spec/spec_helper.rb

@@ -6,10 +6,13 @@ require 'yaml'
 
 Sentimeta.sphere = :hotels
 
-require 'fakeweb'
+require 'webmock/rspec'
+require "vcr"
 
-%i(criteria spheres objects catalog).each do |endpoint|
-  FakeWeb.register_uri(:get,
-                       Sentimeta::Client.generate_uri(endpoint).to_s,
-                       body: "{\"lang\": \"en\", \"#{endpoint}\": [{\"label\": \"label\", \"name\": \"name\"}], \"ver\": 1}")
+VCR.configure do |config|
+  config.cassette_library_dir = "fixtures/vcr_cassettes"
+  config.hook_into :webmock
+  config.configure_rspec_metadata!
 end
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentimeta
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Artem Shpakov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -67,19 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: fakeweb
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.20'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.20'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.9.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.9.3
 description: 
 email: artyom.shpakov@sentimeta.com
 executables: []
@@ -106,6 +120,7 @@ files:
 - lib/sentimeta/observers.rb
 - lib/sentimeta/railtie.rb
 - lib/sentimeta/rest_client.rb
+- lib/sentimeta/support.rb
 - lib/sentimeta/version.rb
 - sentimeta.gemspec
 - spec/client_spec.rb