sentimeta 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20440216e3bbdcef072e45bd1797f18519fce7a7
-  data.tar.gz: d2edb744b925eec679b135bc6bb2e9b1326bb15a
+  metadata.gz: b5ba96801f47ae4acb68c1b51368f60d5c0aeb4d
+  data.tar.gz: f6594b49b90b2bcb7529b5e38ec66cbc1bbe07e4
 SHA512:
-  metadata.gz: bf6b9babb5432ae5e6090809eea86db628dcffde6c79b98d4b3a4840d0c9486ab2d82cd1f1460fd7ab98b8564e927aad3440ab96885ccd7709276517f0efb1b8
-  data.tar.gz: c6b7ebcfd46d5a18695891d24e09da567fa0cb977b8d3f713e1e1f85c2b1e3109404c638eb2d70b800cc8336dadb7b80a4dbfe2150a09f5c7d3d9164b8139705
+  metadata.gz: c1870bb4c69c251b3f6cf7bf39a96cea36c15749bb016072fb0a41cb7d3095a3c96615f8f080ebf721f638d4fb0970a85334f05b80898fe48a15e5195238113a
+  data.tar.gz: fc182ccfa23c1f65612a38c2b797627490d382df701e9f8fd401a077cfb1ecbcf6625d0e9a7abad992565a0e3d84eef28066c89c591f62bad3d2d25f75e102c8

data/Gemfile

@@ -1,4 +1,2 @@
 source "http://rubygems.org"
 gemspec
-
-gem 'colored'

data/lib/sentimeta/client/auth.rb

@@ -0,0 +1,20 @@
+module Sentimeta::Client::Auth
+  extend self
+  extend Sentimeta::RestClient
+
+  def namespace
+    :auth
+  end
+
+  def user token
+    get :users, id: token
+  end
+
+  def signup attrs
+    post :users, user: attrs
+  end
+
+  def signin attrs
+    post :sessions, user: attrs
+  end
+end

data/lib/sentimeta/client/data.rb

@@ -0,0 +1,27 @@
+module Sentimeta::Client::Data
+  extend self
+  extend Sentimeta::RestClient
+  
+  %i(criteria spheres objects catalog).each do |endpoint|
+    define_method endpoint do |options={}|
+      get(endpoint, options)[endpoint.to_s]
+    end
+  end
+
+  def attributes options={}
+    get(:attributes, options)['values']
+  end
+
+  ##
+  # Usage:
+  #   search text: 'pitt' [, where: 'actors' ]
+  def search options={}
+    result = get :search, options
+    if options.has_key? :where
+      result[options[:where]]
+    else
+      result
+    end
+  end
+
+end

data/lib/sentimeta/client/prices.rb

@@ -0,0 +1,12 @@
+module Sentimeta::Client::Prices
+  extend self
+  extend Sentimeta::RestClient
+
+  def namespace
+    :prices
+  end
+
+  def method_missing method, *args
+    get method, *args
+  end
+end

data/lib/sentimeta/client.rb

@@ -1,57 +1,4 @@
-require 'open-uri'
-require 'json'
-
-
-module Sentimeta
-  module Client
-
-    class << self
-      %i(criteria spheres objects catalog).each do |endpoint|
-        define_method endpoint do |options={}|
-          Sentimeta::Client.fetch(endpoint, options)[endpoint.to_s]
-        end
-      end
-
-      def attributes options={}
-        fetch(:attributes, options)['values']
-      end
-
-      def prices options={}
-        fetch :prices, options
-      end
-
-      def fetch endpoint, options={}
-        options = options.keep_if { |key, value| !!value }
-        send_request generate_uri endpoint, options
-      end
-
-      def generate_uri endpoint, options={}
-        url = [].tap do |components|
-          components << Sentimeta.endpoint
-          components << (options.delete(:sphere) || Sentimeta.sphere) unless endpoint == :spheres
-          components << endpoint
-          components << options.delete(:filter) if endpoint == :attributes
-          components << options.delete(:provider) if endpoint == :prices
-          components << options.delete(:id)
-        end.compact.join('/')
-
-        uri = URI.parse url
-        # uri.query = URI.encode_www_form(p: options.reverse_merge(lang: Sentimeta.lang).to_json)
-        uri.query = URI.encode_www_form(p: options.merge(lang: Sentimeta.lang).to_json)
-        uri
-      end
-
-      def send_request uri
-        Sentimeta.logger.debug "  #{ 'Sentimeta:'.green } #{ URI.unescape uri.to_s }"
-        Observers.each { |observer| observer.notify "fetch", URI.unescape(uri.to_s) }
-        begin
-          JSON.parse(uri.open.read)
-        rescue
-          raise Sentimeta::Error::Unreachable
-        end
-      end
-
-    end
-
-  end
+module Sentimeta::Client
+  extend Sentimeta::RestClient
+  extend Sentimeta::Client::Data
 end

data/lib/sentimeta/error/unreachable.rb

@@ -2,8 +2,11 @@ module Sentimeta
   module Error
     class Unreachable < StandardError
 
-      def initialize msg = "Error requesting Sentimeta API"
+      attr_reader :response
+
+      def initialize msg="Error requesting Sentimeta API", response=nil
         super msg
+        @response = response
       end
 
     end

data/lib/sentimeta/init.rb

@@ -0,0 +1,38 @@
+require 'yaml'
+
+
+module Sentimeta
+  class << self
+
+    attr_accessor :env, :sphere
+    attr_writer :endpoint, :lang, :logger
+
+    def endpoint
+      @endpoint ||= begin
+        config_path = File.join(File.dirname(File.expand_path(__FILE__)), '../../config/endpoint.yml')
+        config = YAML.load_file(config_path)[env.to_s]
+        config['url']
+      end
+    end
+
+    def lang
+      if defined?(::I18n) and ::I18n.respond_to?(:locale)
+        self.lang = I18n.locale
+      end
+      @lang || :en
+    end
+
+    def init options
+      options.each do |option, value|
+        public_send("#{ option }=", value) if respond_to?("#{ option }=")
+      end
+    end
+
+    def logger
+      @logger ||= Logger.new STDOUT
+    end
+  end
+
+  self.env = DEFAULT_ENV
+
+end

data/lib/sentimeta/logger.rb

@@ -1,3 +1,6 @@
+require 'logger'
+
+
 module Sentimeta
 
   def logger

data/lib/sentimeta/railtie.rb

@@ -0,0 +1,13 @@
+module Sentimeta
+  class Railtie < Rails::Railtie
+
+    config.sentimeta = ActiveSupport::OrderedOptions.new
+    config.sentimeta.env = Sentimeta::DEFAULT_ENV
+    config.sentimeta.observers = Sentimeta::Observers
+
+    initializer "sentimeta.env" do |app|
+      Sentimeta.env = app.config.sentimeta.env
+    end
+
+  end
+end

data/lib/sentimeta/rest_client.rb

@@ -0,0 +1,78 @@
+require 'json'
+require "colorize"
+require "rest_client"
+
+
+module Sentimeta
+  module RestClient
+    require "sentimeta/error/unreachable"
+    # require "sentimeta/error/record_not_found"
+
+
+    class ApiResponse
+      attr_accessor :status, :body
+
+      def initialize response
+        self.status = response.code
+        self.body   = JSON.parse(response)
+      end
+
+      def ok?
+        status < 300
+      end
+
+      delegate :[], to: :body
+    end
+
+
+    def fetch path, params={}
+      method = params.delete(:method) || :get
+      params = params.keep_if { |key, value| !!value }
+
+      url = generate_uri path, params
+      url = "#{ url }?p=#{ params.to_json }" if method.to_sym == :get && params.present?
+      Sentimeta.logger.debug "  #{ 'Sentimeta:'.colorize :green } #{ method.upcase } #{ url } #{ params.to_json if params.present? && method.to_sym != :get }"
+      Observers.each { |observer| observer.notify "fetch", "#{ method.upcase } #{ url } #{ params.to_json if params.present? }" }
+
+      response = begin
+        ::RestClient::Request.execute \
+          method: method,
+          url: URI::encode(url),
+          payload: params,
+          headers: { 'X-SERVER-ACCESS-TOKEN' => 'c916b1e13b30764b39d47475e1cef4ee' }, # TODO define a property
+          accept: :json
+      rescue ::RestClient::Exception => e
+        Sentimeta.logger.error "  #{ 'Sentimeta:'.colorize :red } #{ e.message } / #{ e.response }"
+        return ApiResponse.new e.response
+      rescue
+        raise Unreachable.new e.message, ApiResponse.new(e.response)
+      end
+      ApiResponse.new response
+    end
+
+    def method_missing method, *args
+      if %i(get post put patch delete options).include?(method)
+        path, params = args
+        fetch path, (params || {}).merge(method: method)
+      else
+        Sentimeta.logger.fatal "Unknown method #{ method }(#{ method.class.name })" # TODO remove
+      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 << endpoint
+        components << options.delete(:filter) if endpoint == :attributes  # TODO remove
+        components << options.delete(:provider) if endpoint == :prices    # TODO remove
+        components << options.delete(:id)
+      end.compact.join('/')
+    end
+  end
+
+end

data/lib/sentimeta/version.rb

@@ -1,3 +1,3 @@
 module Sentimeta
-  VERSION = "0.0.8"
+  VERSION = "0.1.0"
 end

data/lib/sentimeta.rb

@@ -1,40 +1,17 @@
-module Sentimeta
-
-  require "sentimeta/version"
-  require "sentimeta/client"
-  require "sentimeta/observers"
-  require "sentimeta/model"
-  require "sentimeta/logger"
-  require "sentimeta/error/unreachable"
-  require "sentimeta/error/record_not_found"
-
-  require 'logger'
-  require 'yaml'
-
-  class << self
-    attr_accessor :env, :sphere
-    attr_writer :endpoint, :lang
-
-    def endpoint
-      @endpoint ||= begin
-        config_path = File.join(File.dirname(File.expand_path(__FILE__)), '../config/endpoint.yml')
-        config = YAML.load_file(config_path)[env.to_s]
-        config['url']
-      end
-    end
-
-    def lang
-      if defined?(::I18n) and ::I18n.respond_to?(:locale)
-        self.lang = I18n.locale
-      end
-      @lang || :en
-    end
-
-    def logger
-      @logger ||= Logger.new STDOUT
-    end
-  end
-
-  self.env = :production
+require "sentimeta/version"
 
+module Sentimeta
+  DEFAULT_ENV = :production
+  module Client end
 end
+
+require "sentimeta/rest_client"
+require "sentimeta/client/data"
+require "sentimeta/client/prices"
+require "sentimeta/client/auth"
+require "sentimeta/client"
+require "sentimeta/observers"
+require "sentimeta/model"
+require "sentimeta/logger"
+require "sentimeta/railtie" if defined? Rails
+require "sentimeta/init"

data/sentimeta.gemspec

@@ -8,11 +8,14 @@ Gem::Specification.new do |s|
   s.summary          = "Sentimeta API client"
   s.authors          = ["Artem Shpakov"]
   s.email            = 'artyom.shpakov@sentimeta.com'
-  s.homepage         = ""
+  s.homepage         = "http://toprater.com"
   s.license          = "MIT"
   s.files            = `git ls-files`.split("\n")
-  s.add_development_dependency "bundler", "~> 1.5"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rspec", "~> 3.1.0"
+
+  s.add_runtime_dependency "colorize", "~> 0.7"
+  s.add_runtime_dependency "rest-client", "~> 1.7"
+
+  s.add_development_dependency "rake", "~> 10.4"
+  s.add_development_dependency "rspec", "~> 3.1"
   s.add_development_dependency "fakeweb", "~> 1.3"
 end

metadata

@@ -1,57 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: sentimeta
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Artem Shpakov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-24 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
+        version: '0.7'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
@@ -81,17 +95,23 @@ files:
 - config/endpoint.yml
 - lib/sentimeta.rb
 - lib/sentimeta/client.rb
+- lib/sentimeta/client/auth.rb
+- lib/sentimeta/client/data.rb
+- lib/sentimeta/client/prices.rb
 - lib/sentimeta/error/record_not_found.rb
 - lib/sentimeta/error/unreachable.rb
+- lib/sentimeta/init.rb
 - lib/sentimeta/logger.rb
 - lib/sentimeta/model.rb
 - lib/sentimeta/observers.rb
+- lib/sentimeta/railtie.rb
+- lib/sentimeta/rest_client.rb
 - lib/sentimeta/version.rb
 - sentimeta.gemspec
 - spec/client_spec.rb
 - spec/model_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: http://toprater.com
 licenses:
 - MIT
 metadata: {}