da_face 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2cc7da25ff983a44979fc89589b3ba941ec8fe8
-  data.tar.gz: 027c7b27941c2022d1a2e3d1de208a5f82ded031
+  metadata.gz: 4fd1da0946492f15183e9eeb679d72952ed6f275
+  data.tar.gz: 94128e1c3a3f8043b765116f3817b8689356ffc9
 SHA512:
-  metadata.gz: add136c3162345f1c338d70943513d6fa505abbaa2c139bc7bb64bb7e31c101df625baf93a408c84ee42654f29ba2a646adafe4b6457bb769d4f0a084561b068
-  data.tar.gz: 1a18b8987549558d183c855ed4efb8ad15102a747f8a7e3293d59b70e4efffaebf7f3c711b84c14780dd141ddd843528a40dac9a2792af0d93f6d1919ecc2730
+  metadata.gz: 93a718f1ca33395ac395f0c072c45eb113811a058f46e78924e0505ffc14ce5b7096c063c36cf7862e4b0a06201bd278b3869fd22d7f560d5ec9111994a30b5e
+  data.tar.gz: e751bd90a27a94a987d42d5b44619017b976fb8fc35b36f6a9c52d5af8dc97cca10ba0b2c2262435a7ca08e3909bc8ef9865674b048f3fd94777eaa7af64937b

data/.gitignore

@@ -17,4 +17,5 @@ tmp/*
 *.swp
 *.iml
 .rvmrc
-coverage
+coverage
+pkg

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_face (0.0.1)
+    da_face (0.0.2)
       excon
       json
 

data/lib/da_face/datasift/da_object.rb

@@ -5,9 +5,10 @@ module DaFace
       TWITTER_DELETE_NOTIFICATION = :delete_notification
       TWITTER_USER_NOTIFICATION = :user_notification
       
-      attr_reader :interaction, :demographic, :links, :twitter, :salience, :language, :kind
+      attr_reader :interaction, :demographic, :links, :twitter, :salience, :language, :kind, :raw
 
-      def initialize data={}
+      def initialize data={}, raw_data={}
+        @raw = raw_data
         if data[:deleted]
           @twitter = DaFace::Datasift::TwitterDeleteNotification.new(data)
         else

data/lib/da_face/datasift/parser.rb

@@ -4,12 +4,13 @@ module DaFace
       include DaFace::Utilities
 
       def build_object data
-        DaFace::Datasift::DaObject.new data
+        symbolized_data = symbolize_keys(data.keys, data)
+        DaFace::Datasift::DaObject.new symbolized_data, data
       end
 
       def build_objects data
         objects = []
-        data[:interactions].each do |object_data|
+        data['interactions'].each do |object_data|
           objects << build_object(object_data)
         end
 
@@ -20,15 +21,14 @@ module DaFace
         raise DaFace::Datasift::MissingJson unless json
 
         data = JSON.parse(json)
-        symbolized_data = symbolize_keys(data.keys, data)
-        return build_objects(symbolized_data)
+        return build_objects(data)
       end
       
       def parse_from_json json=nil
         raise DaFace::Datasift::MissingJson unless json
+
         data = JSON.parse(json)
-        symbolized_data = symbolize_keys(data.keys, data)
-        return build_object(symbolized_data)
+        return build_object(data)
       end
     end
   end

data/lib/da_face/datasift/twitter.rb

@@ -3,7 +3,7 @@ module DaFace
     class Twitter
       include DaFace::Utilities
       
-      attr_accessor :retweet, :retweeted, :tweet, :status
+      attr_reader :retweet, :retweeted, :tweet, :status
 
       def self.new data
         if data[:status]
@@ -30,12 +30,12 @@ module DaFace
 
       private
       def extract_retweet_info data
-        data[:retweet].merge({:text => data[:retweeted][:text]})
+        data[:retweet]
       end
 
       def extract_tweet_info data
         if data[:retweet]
-          data[:retweeted]
+          data[:retweeted].merge({:text => (data[:retweeted][:text] || data[:retweet][:text])})
         else
           data
         end

data/lib/da_face/version.rb

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

data/spec/da_face/datasift/da_object_spec.rb

@@ -3,13 +3,13 @@ require 'spec_helper'
 describe DaFace::Datasift::DaObject do
   before do
     @parser = DaFace::Datasift::Parser.new
-    fixture = json_fixture('interactions/simple.json')
-    @interaction_data = @parser.symbolize_keys(fixture.keys, fixture)
+    @fixture = json_fixture('interactions/simple.json')
+    @interaction_data = @parser.symbolize_keys(@fixture.keys, @fixture)
   end
 
   describe '#new' do
     it 'creates a DaObject object' do
-      obj = DaFace::Datasift::DaObject.new @interaction_data
+      obj = DaFace::Datasift::DaObject.new @interaction_data, @fixture
 
       expect(obj.class).to eq(DaFace::Datasift::DaObject)
     end
@@ -21,9 +21,20 @@ describe DaFace::Datasift::DaObject do
 
   describe 'attributes' do
     before do 
-      @da_object = DaFace::Datasift::DaObject.new @interaction_data
+      @da_object = DaFace::Datasift::DaObject.new @interaction_data, @fixture
     end
 
+    describe 'raw' do
+      it 'is present' do
+        expect(@da_object.raw).not_to eq(nil)
+      end
+
+      it 'has string keys' do
+        expect(@da_object.raw.keys.map(&:class).uniq.size).to eq(1)
+        expect(@da_object.raw.keys.map(&:class).uniq.first).to eq(String)
+      end
+    end
+    
     describe '#interaction' do
       it 'is present' do
         expect(@da_object.interaction).not_to eq(nil)

data/spec/da_face/datasift/twitter_spec.rb

@@ -44,6 +44,7 @@ describe DaFace::Datasift::Twitter do
         expect(@twitter.tweet.id).to eq(@data[:retweet][:id].to_i)
         expect(@twitter.retweeted.id).to eq(@data[:retweeted][:id].to_i)
         expect(@twitter.retweeted.id).not_to eq(@twitter.tweet.id)
+        expect(@twitter.tweet.text).to eq(@twitter.retweeted.text)
         expect(@twitter.retweet?).to eq(true)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_face
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Rayko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler