thebigdb 1.2.3 → 1.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 208086548323d779597adb12e40c415503bb4dc8
+  data.tar.gz: 3b2ed441b52ac2c9c386f8652f8cb16c7ca5fc45
+SHA512:
+  metadata.gz: 84e73081cd80956a93279d9582d88c8e5fe96697563f93734c123510ec289c1446a45c99300f317af0b5698eedbdc6b417f032578c5fc20af132933b9501c6f0
+  data.tar.gz: 786aaa6c59bb08c373a8b896397738f99408944111d5a5bc05ece4fde65a607230f8f21b5d91a0c0a46d43c16d06b5f067de6545e97af332b974508e5ab02bbe

data/.gitignore

@@ -16,5 +16,7 @@ log/*
 *~
 *.swp
 .rvmrc
+.versions.conf
+.ruby-version
 *.gem
 tmp/*

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
-  - 2.0.0
+  - 2.0.0
+  - 2.1.0

data/Gemfile.lock

@@ -1,52 +1,60 @@
 PATH
   remote: .
   specs:
-    thebigdb (1.2.3)
+    thebigdb (1.3.0)
       rack (~> 1.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.3)
-    coderay (1.0.9)
-    crack (0.3.2)
-    diff-lcs (1.2.2)
-    ffi (1.6.0)
+    addressable (2.3.5)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    coderay (1.1.0)
+    crack (0.4.1)
+      safe_yaml (~> 0.9.0)
+    diff-lcs (1.2.5)
+    ffi (1.9.3)
     formatador (0.2.4)
-    guard (1.7.0)
+    guard (2.2.5)
       formatador (>= 0.2.4)
-      listen (>= 0.6.0)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      thor (>= 0.14.6)
-    guard-rspec (2.5.1)
-      guard (>= 1.1)
-      rspec (~> 2.11)
-    listen (0.7.3)
-    lumberjack (1.0.3)
-    method_source (0.8.1)
-    pry (0.9.12)
-      coderay (~> 1.0.5)
+      listen (~> 2.1)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-rspec (2.6.0)
+      guard (>= 1.8)
+      rspec (~> 2.13)
+    listen (2.4.0)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.4)
+    method_source (0.8.2)
+    pry (0.9.12.4)
+      coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
     rack (1.5.2)
-    rake (10.0.4)
+    rake (10.1.1)
     rb-fchange (0.0.6)
       ffi
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.0)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.3)
       ffi (>= 0.5.0)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
-    slop (3.4.4)
+    rspec-mocks (2.14.4)
+    safe_yaml (0.9.7)
+    slop (3.4.7)
     thor (0.18.1)
-    webmock (1.11.0)
+    timers (1.1.0)
+    webmock (1.16.1)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
 
@@ -55,10 +63,10 @@ PLATFORMS
 
 DEPENDENCIES
   guard-rspec (~> 2.3)
-  rake (~> 10.0.3)
-  rb-fchange
-  rb-fsevent
-  rb-inotify
+  rake (~> 10.0)
+  rb-fchange (~> 0)
+  rb-fsevent (~> 0)
+  rb-inotify (~> 0)
   rspec (~> 2.12)
   thebigdb!
   webmock (~> 1.9)

data/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://secure.travis-ci.org/thebigdb/thebigdb-ruby.png)](http://travis-ci.org/thebigdb/thebigdb-ruby)
 
-A simple ruby wrapper for making requests to the API of [TheBigDB.com](http://thebigdb.com). [Full API documentation](http://developers.thebigdb.com/api).
+A simple ruby wrapper for making requests to the API of [TheBigDB.com](http://thebigdb.com). [Full API documentation](http://thebigdb.com/api).
 
 ## Install
 
@@ -14,18 +14,18 @@ The following actions return a TheBigDB::StatementRequest object, on which you c
 The request will be executed once you call regular methods of Hash on it (``each_pair``, ``[key]``, etc.), or force it with ``load``.
 The Hash returned represents the server's JSON response.
 
-### Search \([api doc](http://developers.thebigdb.com/api#statements-search)\)
+### Search \([api doc](http://thebigdb.com/api#statements-search)\)
 
-    TheBigDB.search("iPhone").with(page: 2)
-    TheBigDB.search({match: "James"}, "job", "President of the United States")
-    TheBigDB.search({match: "Facebook"}, "job", {match: "Executive"})
+    TheBigDB.search(subject: {match: "James"}, property: "job", answer: "President of the United States")
+    TheBigDB.search(subject: "London", property: "population").with(period: {on: "2007-06-05"})
+    TheBigDB.search("iPhone") # will fulltext search "iPhone" in all fields
 
-### Create \([api doc](http://developers.thebigdb.com/api#statements-create)\)
+### Create \([api doc](http://thebigdb.com/api#statements-create)\)
 
-    TheBigDB.create("iPhone 5", "weight", "112 grams")
-    TheBigDB.create("Bill Clinton", "job", "President of the United States").with(period: {from: "1993-01-20 12:00:00", to: "2001-01-20 11:59:59"})
+    TheBigDB.create(subject: "iPhone 5", property: "weight", answer: "112 grams")
+    TheBigDB.create(subject: "Bill Clinton", property: "job", answer: "President of the United States").with(period: {from: "1993-01-20 12:00:00", to: "2001-01-20 12:00:00"})
 
-### Show \([api doc](http://developers.thebigdb.com/api#statements-show)\), Upvote \([api doc](http://developers.thebigdb.com/api#statements-upvote)\) and Downvote \([api doc](http://developers.thebigdb.com/api#statements-downvote)\)
+### Show \([api doc](http://thebigdb.com/api#statements-show)\), Upvote \([api doc](http://thebigdb.com/api#statements-upvote)\) and Downvote \([api doc](http://thebigdb.com/api#statements-downvote)\)
 
     TheBigDB.show("id-of-the-sentence")
     TheBigDB.upvote("id-of-the-sentence")
@@ -38,7 +38,7 @@ That's it!
 If you want more details on what is sent and what is received, you can use the generic TheBigDB::Statement method. It returns a TheBigDB::Request object.
 It has several readable attributes:
     
-    request = TheBigDB::Statement(:search, {nodes: ["iPhone", "weight"]})
+    request = TheBigDB::Statement(:search, {nodes: {subject: "iPhone", property: "weight"}})
     request.http              # Net::HTTP
     request.http_request      # subclass of Net::HTTPGenericRequest (Net::HTTP::Get or Net::HTTP::Post)
     request.http_response     # subclass of Net::HTTPResponse (e.g. Net::HTTPOK)

data/lib/thebigdb/resources/statement.rb

@@ -48,11 +48,11 @@ module TheBigDB
   end
 
   # Shortcuts to actions
-  def self.search(*nodes)
+  def self.search(nodes = {})
     StatementRequest.new("search").with("nodes" => nodes)
   end
 
-  def self.create(*nodes)
+  def self.create(nodes = {})
     StatementRequest.new("create").with("nodes" => nodes)
   end
 

data/lib/thebigdb/version.rb

@@ -1,8 +1,8 @@
 module TheBigDB
   module VERSION
     MAJOR = 1
-    MINOR = 2
-    TINY  = 3
+    MINOR = 3
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

data/spec/resources/statement_spec.rb

@@ -5,7 +5,7 @@ describe "Statement" do
     before do
       stub_request(:get, @request_path.call("search")).to_return(:body => '{"server_says": "hello world"}')
 
-      @request = TheBigDB::Statement(:search, nodes: ["a a", "b"])
+      @request = TheBigDB::Statement(:search, nodes: {subject: "a a", property: "b"}, contexts: [{property: "foo", answer: "bar"}])
     end
 
     it "sets the correct data_sent instance variable" do
@@ -15,7 +15,7 @@ describe "Statement" do
         "port" => TheBigDB.api_port,
         "path" => "/v#{TheBigDB.api_version}/statements/search",
         "method" => "GET",
-        "params" => {"nodes" => {"0" => "a a", "1" => "b"}}
+        "params" => {"nodes" => {"subject" => "a a", "property" => "b"}, "contexts" => {"0" => {"property" => "foo", "answer" => "bar"}}}
       }
     end
 
@@ -33,27 +33,27 @@ describe "StatementRequest" do
   end
 
   it "makes normal requests" do
-    @search = TheBigDB.search("a a", "b", {match: "blue"})
+    @search = TheBigDB.search(subject: "a a", property: "b", answer: {match: "blue"})
     @search.with(page: 2)
-    @search.params.should == {"nodes" => ["a a", "b", {match: "blue"}], "page" => 2}
+    @search.params.should == {"nodes" => {subject: "a a", property: "b", answer: {match: "blue"}}, "page" => 2}
   end
 
   it "cache the response unless the params are modified, or asked to" do
     stub_request(:get, @request_path.call("search")).to_return(:body => '{status: "success", statements: []}')
 
-    response = TheBigDB.search("a", "b", {match: "blue"}).with(page: 2)
+    response = TheBigDB.search(subject: "a", property: "b", answer: {match: "blue"}).with(page: 2)
     response.load
     response.load
 
-    response = TheBigDB.search("a", "b", {match: "red"}).with(page: 2)
+    response = TheBigDB.search(subject: "a", property: "b", answer: {match: "red"}).with(page: 2)
     response.load
     response.load!
 
     a_request(:get, @request_path.call("search"))
-      .with(query: hash_including({"nodes" => ["a", "b", {match: "blue"}], "page" => "2"})).should have_been_made.once
+      .with(query: hash_including({"nodes" => {subject: "a", property: "b", answer: {match: "blue"}}, "page" => "2"})).should have_been_made.once
 
     a_request(:get, @request_path.call("search"))
-      .with(query: hash_including({"nodes" => ["a", "b", {match: "red"}], "page" => "2"})).should have_been_made.times(2)
+      .with(query: hash_including({"nodes" => {subject: "a", property: "b", answer: {match: "red"}}, "page" => "2"})).should have_been_made.times(2)
   end
 
   it "has standard actions correctly binded" do
@@ -63,7 +63,7 @@ describe "StatementRequest" do
     stub_request(:post, @request_path.call("upvote")).to_return(:body => '{status: "success"}')
     stub_request(:post, @request_path.call("downvote")).to_return(:body => '{status: "success"}')
 
-    TheBigDB.search("a", "b", {match: "blue"}).load
+    TheBigDB.search(subject: "a", property: "b", answer: {match: "blue"}).load
     TheBigDB.show("foobar").load
     TheBigDB.create("foobar").load
     TheBigDB.upvote("foobar").load

data/thebigdb.gemspec

@@ -14,12 +14,12 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "rack", "~> 1.4"
 
-  s.add_development_dependency "rake", "~> 10.0.3"
+  s.add_development_dependency "rake", "~> 10.0"
   s.add_development_dependency "rspec", "~> 2.12"
   s.add_development_dependency "guard-rspec", "~> 2.3"
-  s.add_development_dependency "rb-inotify"
-  s.add_development_dependency "rb-fsevent"
-  s.add_development_dependency "rb-fchange"
+  s.add_development_dependency "rb-inotify", "~> 0"
+  s.add_development_dependency "rb-fsevent", "~> 0"
+  s.add_development_dependency "rb-fchange", "~> 0"
   s.add_development_dependency "webmock", "~> 1.9"
 
 

metadata

@@ -1,142 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: thebigdb
 version: !ruby/object:Gem::Version
-  version: 1.2.3
-  prerelease: 
+  version: 1.3.0
 platform: ruby
 authors:
 - Christophe Maximin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2014-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.12'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rb-inotify
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-fchange
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
 description: TheBigDB a simply structured open database of real life facts. See http://thebigdb.com
@@ -146,9 +129,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -172,27 +155,26 @@ files:
 - thebigdb.gemspec
 homepage: http://thebigdb.com
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby bindings for TheBigDB API
 test_files:
 - spec/helpers_spec.rb