wit_bot 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bbbc51b2c56bfa6a606d1d370e56446fca0dd26
-  data.tar.gz: 22acb9bfc4d056deb8e809e3332ccf8f96ad9b2f
+  metadata.gz: 2822b54c41afb8236a1ae7c1e14480a18d589652
+  data.tar.gz: 1faa556ee9be09bfaec737127f8d91e5a648e811
 SHA512:
-  metadata.gz: 93d0c8c4c3d1700572345033f7acc343f2b66f40a2bf86712ace196799a4514ee30f41f26dac2f39ef1d1c25d5ed4579a9494764bdbaba6f7e8f8257bcfad949
-  data.tar.gz: 945dbe402861679adcff5eb1afaa8fb59ad59b5d2c875f7d05a7175a3d6cbc16050d54d7a60c38e27357db258e35d8cbc96a33e9dd339a53cf5a661b66b4c08f
+  metadata.gz: cd98b6c765b838f0d0fb21db89bd96ba2ce61a1d2adca4272f2dd75947020b392915090dd79b14622298560325668ee23c1ffcccd73208b5e2aa8418a768ace9
+  data.tar.gz: 7c2f7f111dd129e6a7bbce791621fccad40678b0cca120a3e4252581eb54c852a66bd0789c93d5c1df81798d0f0fe9fed701c84e747ee1d3788413b2a9e86d4d

data/.ruby-version

@@ -0,0 +1 @@
+2.2.4

data/lib/wit_bot/configuration.rb

@@ -1,9 +1,11 @@
-class Configuration
-  attr_accessor :token, :host, :minimum_confidence, :version
-  def initialize
-    @token = nil
-    @host = 'https://api.wit.ai'
-    @minimum_confidence = 0
-    @version = "20160313"
+module WitBot
+  class Configuration
+    attr_accessor :token, :host, :minimum_confidence, :version
+    def initialize
+      @token = nil
+      @host = 'https://api.wit.ai'
+      @minimum_confidence = 0
+      @version = '20160313'
+    end
   end
 end

data/lib/wit_bot/models/context.rb

@@ -31,8 +31,16 @@ module WitBot
       @location = h[:location]
       self
     end
+
     def self.from_hash(json)
       self.new.from_hash json
     end
+
+    def ==(other)
+      self.state == other.state &&
+          self.reference_time == other.reference_time &&
+          self.entities == other.entities &&
+          self.location == other.location
+    end
   end
 end

data/lib/wit_bot/models/context_entities.rb

@@ -1,5 +1,8 @@
 module WitBot
   class ContextEntities
+    attr_reader :id
+    attr_accessor :values
+
     def initialize
       @hash = {}
     end
@@ -23,5 +26,9 @@ module WitBot
     def self.from_hash(json)
       self.new.from_hash json
     end
+
+    def ==(other)
+      self.id == other.id && self.values == other.values
+    end
   end
 end

data/lib/wit_bot/models/message.rb

@@ -36,6 +36,7 @@ module WitBot
       self
     end
     def self.from_hash(thread, id, json)
+      json = json.with_indifferent_access
       return Bot::Message.from_hash thread, id, json if json[:bot]
       self.new(thread, json[:text], id: id).from_hash json
     end
@@ -68,7 +69,7 @@ module WitBot
     end
 
     def parse_outcomes(outcomes=@_outcomes)
-      outcomes.each_with_index.map { |outcome, i| Outcome.new self, outcome, i }
+      outcomes.each_with_index.map { |outcome, i| Outcome.new self, outcome, i } if outcomes
     end
 
     def parse_outcomes!(outcomes=@_outcomes)
@@ -78,5 +79,16 @@ module WitBot
     def outcome
       outcomes.first
     end
+
+    def ==(other)
+      self.text == other.text &&
+          self._text == other._text &&
+          self.id == other.id &&
+          self.bot? == other.bot? &&
+          self.sent == other.sent &&
+          self._outcomes == other._outcomes &&
+          self.thread.equals_without_messages(other.thread) &&
+          self.outcomes == other.outcomes
+    end
   end
 end

data/lib/wit_bot/models/message_thread.rb

@@ -18,7 +18,7 @@ module WitBot
     def messages_list(user: true, bot: false)
       bot_messages = bot ? @bot_messages.values : []
       user_messages = user ? @messages.values : []
-      bot_messages + user_messages
+      user_messages + bot_messages
     end
 
     def create_message(text, id=SecureRandom.uuid)
@@ -54,13 +54,28 @@ module WitBot
       @messages = WitBot::Message.many_from_hash(self, m[:user])
       @bot_messages = WitBot::Message.many_from_hash(self, m[:bot])
 
-      @context = Context.from_hash json[:context]
+      @context = Context.from_hash json[:context] if json[:context]
       @metadata = json[:metadata]
       self
     end
 
     def self.from_hash(json)
+      json = json.with_indifferent_access
       self.new(json[:id]).from_hash json
     end
+
+    def ==(other)
+      self.id == other.id &&
+          self.context == other.context &&
+          self.bot_messages == other.bot_messages &&
+          self.messages == other.messages &&
+          self.metadata == other.metadata
+    end
+
+    def equals_without_messages(other)
+      self.id == other.id &&
+          self.context == other.context &&
+          self.metadata == other.metadata
+    end
   end
 end

data/lib/wit_bot/models/outcome.rb

@@ -10,16 +10,7 @@ module WitBot
       @_text = @raw[:_text]
 
       @intent = WitModel::Intent.find raw[:intent]
-      @entities = @raw[:entities].each.inject({}) do |entities, entity_info|
-        role, all = entity_info
-        all = all.map { |data| WitModel::Entity.find(data[:entity], create: false).model role, data }
-
-        data = all.shift
-        data.others = all
-
-        entities[role] = data
-        entities
-      end.with_indifferent_access
+      @entities = EntityModelProxy.new raw[:entities]
 
       raise LowConfidenceError self if i == 0 && low_confidence?
     end
@@ -27,5 +18,14 @@ module WitBot
     def low_confidence?
       @confidence < WitBot.config.minimum_confidence
     end
+
+    def ==(other)
+      self.message == other.message &&
+          self.raw == other.raw &&
+          self._text == other._text &&
+          self.confidence == other.confidence &&
+          self.intent == other.intent &&
+          self.entities == other.entities
+    end
   end
 end

data/lib/wit_bot/models/wit/entity.rb

@@ -26,6 +26,10 @@ module WitBot
         @@entities[name] || create && Entity.new(id: name, request: true)
       end
 
+      def ==(other)
+        self.name == other.name
+      end
+
       protected
 
       def process_values(values)

data/lib/wit_bot/models/wit/entity/entity_model.rb

@@ -1,6 +1,30 @@
 module WitBot
+  class EntityModelProxy < HashWithIndifferentAccess
+    attr_reader :raw
+
+    def initialize(raw_entities)
+      @raw = raw_entities
+
+      super Hash[*raw_entities.map do |(role, all)|
+        all = all.map { |data| WitModel::Entity.find(data[:entity], create: false).model role, data }
+
+        data = all.first
+
+        data.all = all
+
+        create_getter role
+
+        [role, data]
+      end.flatten]
+    end
+
+    private
+    def create_getter(var)
+      self.class.send(:define_method, var, -> { self[var] })
+    end
+  end
   class EntityModel
-    attr_accessor :others
+    attr_accessor :all
     attr_reader :entity, :role, :raw, :value
 
     def initialize(entity, role, raw)
@@ -18,6 +42,14 @@ module WitBot
       @others = []
     end
 
+    def others
+      all - [self]
+    end
+
+    def ==(other)
+      self.entity == other.entity && self.value == other.value
+    end
+
     def to_s
       value.to_s
     end

data/lib/wit_bot/models/wit/intent.rb

@@ -26,6 +26,10 @@ module WitBot
         @@intents[name] || self.new(name, request: true)
       end
 
+      def ==(other)
+        self.name == other.name
+      end
+
       protected
 
       def process_expressions(expressions)

data/lib/wit_bot/version.rb

@@ -1,3 +1,3 @@
 module WitBot
-  VERSION = '0.3.3'
+  VERSION = '0.4.0'
 end

data/wit_bot.gemspec

@@ -20,9 +20,11 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.4"
+  spec.add_development_dependency "simplecov", ">= 0"
 
-  spec.add_dependency "http", "~> 1.0.2"
+  spec.add_dependency "http", ">= 1.0.2"
   spec.add_dependency "activesupport", ">= 4"
-  spec.add_dependency "require_all", "~> 1.3.3"
-  spec.add_dependency "awesome_print", "~> 1.6.1"
+  spec.add_dependency "require_all", ">= 1.3.3"
+  spec.add_dependency "awesome_print", ">= 1.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wit_bot
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Ben (@penne12_)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,17 +39,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: http
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.2
 - !ruby/object:Gem::Dependency
@@ -70,28 +98,28 @@ dependencies:
   name: require_all
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.1
 description: A better wit.ai client for Ruby. Written in Ruby. With an api for creating
@@ -104,6 +132,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -171,10 +200,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A better wit.ai client for Ruby. Written in Ruby. With an api for creating
   bots.
 test_files: []
-has_rdoc: