sentimeta 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03b523382194d9a1dc3d6148b04feef2d7fd5014
-  data.tar.gz: 3e14c6eb60732935c166558446330879dc652387
+  metadata.gz: 0374f164fb37ea00358050a3f867747cbcf68781
+  data.tar.gz: 30d9090b1554c07228f989c0ddc977d8dab7c9f7
 SHA512:
-  metadata.gz: cb1c7b31e955c86605412398e6ae6daa1e0a91990170b23bf0e63764b650ddce00d8c5317ec76ac357ca74b10f13685c0fec49f2fa01ae02b047085ad2b6a6c8
-  data.tar.gz: be898aaff8c1d2728cd92da3a8732a39d2d42c4db71762a544fe03a6639384aa2221e9b7b032fe45cb42d98776671b5be9636ff2d5dee4926c2396532c095028
+  metadata.gz: 8a08d37a4b66f78d92c0683f495de4fa141d9885622e6ecb7f4e86a2b2214c4a292a4bac682c9d0dba552462e0f4f1250f330fcb926059706027521ee5b80f7a
+  data.tar.gz: 0faff4f50fa2439b4f001ede137dfedae90ac14aebc8c385a0af351c21028b8b2cc5c6e886e8f006235872233178c7ae0ab87b99dea9f39cc45ce1e4ac332455

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/README.md

@@ -15,11 +15,11 @@ And then execute:
 ```ruby
 Sentimeta.env   = :staging # :production is default
 Sentimeta.lang  = :en # default is I18n.locale if defined
-    
-# client can be used directly (fetch criteria, spheres & objects)
+
+# client can be used directly (fetch criteria, spheres, catalog & objects)
 spheres = Sentimeta::Client.spheres
 Sentimeta.sphere = spheres.first['name'] # pick a specific sphere
-    
+
 # or via subclassing Sentimeta::Model
 class Criterion < Sentimeta::Model
   endpoint :criteria # send requests to /api/v1/#{Sentimeta.sphere}/criteria
@@ -28,13 +28,16 @@ class Criterion < Sentimeta::Model
   def self.all
     fetch subcriteria: true
   end
-      
-  def self.leafs options
-    all(options).flat_map do |root|
-      root['subcriteria'].map { |sub| new sub }
+
+  def self.leafs
+    all.flat_map do |root|
+      root.subcriteria.map { |sub| new sub }
     end
   end
 end
-    
+
 criteria = Criterion.leafs # an array of Criterion class instances
+
+# to fetch raw data
+presets = Sentimeta::Client.fetch :infotext, {subcriteria: true, design: "std", param: "main", lang: "en"}
 ```

data/Rakefile

@@ -1 +1,4 @@
 require "bundler/gem_tasks"
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)

data/config/endpoint.yml

@@ -2,4 +2,4 @@ production:
   url: 'https://api.toprater.com/api/v1'
 
 staging:
-  url: 'http://5.9.141.34/api/v1'
+  url: 'http://5.9.0.5/api/v1'

data/lib/sentimeta/client.rb

@@ -6,25 +6,32 @@ module Sentimeta
   module Client
 
     class << self
-      %i(criteria spheres objects).each do |endpoint|
+      %i(criteria spheres objects catalog).each do |endpoint|
         define_method endpoint do |options={}|
-          fetch(endpoint, options)[endpoint.to_s]
+          Sentimeta::Client.fetch(endpoint, options)[endpoint.to_s]
         end
       end
 
       def fetch endpoint, options={}
+        send_request generate_uri endpoint, options
+      end
+
+      def generate_uri endpoint, options={}
         url = [].tap do |components|
           components << Sentimeta.endpoint
-          components << (Sentimeta.sphere || options.delete(:sphere)) if endpoint != :spheres
+          components << (options.delete(:sphere) || Sentimeta.sphere) unless endpoint == :spheres
           components << endpoint
           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)
-        Sentimeta.logger.debug "  Sentimeta: #{ URI.unescape uri.to_s }"
-
+        # 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: #{ URI.unescape uri.to_s }"
         begin
           JSON.parse(uri.open.read)
         rescue

data/lib/sentimeta/version.rb

@@ -1,3 +1,3 @@
 module Sentimeta
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/sentimeta.rb

@@ -14,8 +14,8 @@ module Sentimeta
     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].symbolize_keys
-        config[:url]
+        config = YAML.load_file(config_path)[env.to_s]
+        config['url']
       end
     end
 

data/sentimeta.gemspec

@@ -13,4 +13,6 @@ Gem::Specification.new do |s|
   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_development_dependency "fakeweb", "~> 1.3"
 end

data/spec/client_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe Sentimeta::Client do
+
+  subject { Sentimeta::Client }
+
+  let(:valid_url) { subject.generate_uri(:spheres) }
+
+
+  describe :fetch do
+    it { should respond_to :fetch }
+  end
+
+
+  describe :generate_uri do
+    it "should return an instance of URI" do
+      expect(valid_url).to be_kind_of URI
+    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
+
+    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
+    %i(criteria spheres objects catalog).each do |endpoint|
+      it { should respond_to endpoint }
+
+      it "##{endpoint} should call fetch once" do
+        expect(subject).to receive(:fetch).and_call_original.once
+        subject.public_send endpoint
+      end
+
+      it "##{endpoint} should return an array" do
+        expect(subject.public_send endpoint).to be_kind_of Array
+      end
+    end
+  end
+
+end

data/spec/model_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Sentimeta::Model do
+
+  subject(:client) { Sentimeta::Client }
+  subject { model = Sentimeta::Model; model.endpoint :spheres; model }
+
+  it { should respond_to :fetch }
+
+
+  describe :fetch do
+
+    it "should return an array" do
+      expect(subject.send :fetch).to be_kind_of Array
+    end
+
+    it "should call client_fetch once" do
+      expect(client).to receive(:fetch).and_call_original.once
+      subject.send :fetch
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,15 @@
+require 'bundler/setup'
+Bundler.setup
+require 'sentimeta'
+
+require 'yaml'
+
+Sentimeta.sphere = :hotels
+
+require 'fakeweb'
+
+%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}")
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentimeta
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Artem Shpakov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: 
 email: artyom.shpakov@sentimeta.com
 executables: []
@@ -45,6 +73,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENCE.txt
 - README.md
@@ -56,6 +85,9 @@ files:
 - lib/sentimeta/model.rb
 - lib/sentimeta/version.rb
 - sentimeta.gemspec
+- spec/client_spec.rb
+- spec/model_spec.rb
+- spec/spec_helper.rb
 homepage: ''
 licenses:
 - MIT