ebooks 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b92abdf753365a92607b400fdf303b6e96f5e9a
-  data.tar.gz: ee4a3d4cd0c3b6ebceb504120f0eda5feb87bcde
+  metadata.gz: 1c27c66d737ceb553a92fdf5ff43988e814d9e6c
+  data.tar.gz: d3541f051138de3992c20fbb59ab36629954a691
 SHA512:
-  metadata.gz: 9934d51b0e7905b64b6c35ec05b4de67a28e20650c117849352b698fde1a33a59e43cf741bed03f060b47d35cc493017ef87e3d0135f7180f272b7494741ec4f
-  data.tar.gz: e50bc685459f82a615e68cfeef3a55d7dba77ebdecdef419ecce71fb2133a9aae25ef912b86f15e549ac11f0a239c98f5412117c878e93a392d044f010b81785
+  metadata.gz: bda3e52be0ba90d94c56c94c435b2a162e503df1fa3760707189fbf32eef15d3859665e32ecdf7f48854475c06ee45b2d92d8e9bb62189f9319f85b5c2867cb1
+  data.tar.gz: 1f9f2b58633df4502436a253cf79c7ae39c32c0b48ca3c9ad90f99829c5aa017ace407c36bd0358fbd3479da57e1f6555ba216bbdf563b91e640413f54a7a786

data/History.markdown

@@ -0,0 +1,3 @@
+## HEAD
+
+  * Fix Twitter v5 Integration (#3)

data/ebooks.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "thread"
-  spec.add_runtime_dependency "twitter"
+  spec.add_runtime_dependency "twitter", "~> 5.0"
   spec.add_runtime_dependency "marky_markov"
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/lib/ebooks.rb

@@ -14,37 +14,37 @@ module Ebooks
   autoload :Generator, 'ebooks/generator'
   autoload :Twitter,   'ebooks/twitter'
 
-  def self.read_config_file(file = '~/.ebooks')
-    contents = File.read(file.sub('~', ENV["HOME"]))
-    YAML.load(contents)
+  class << self
+    def read_config_file(file = '~/.ebooks')
+      contents = File.read(file.sub('~', ENV["HOME"]))
+      YAML.load(contents)
+    end
+
+    def configuration(overrides = {})
+      {
+        :tweets_csv_path => 'tweets.csv',
+        :corpus_path     => 'markov_dict.txt',
+        :dictionary_name => 'dictionary', # don't include the .mmd
+        :twitter => {
+          :consumer_key       => '',
+          :consumer_secret    => '',
+          :oauth_token        => '',
+          :oauth_token_secret => ''
+        }
+      }.deep_merge(overrides)
+    end
+
+    def generate(overrides = {})
+      config = configuration(overrides)
+      generator = Ebooks::Generator.new(config)
+
+      generator.generate_sentence
+    end
+
+    def tweet(overrides = {})
+      config = configuration(overrides)
+      Ebooks::Twitter.new(config[:twitter]).tweet(generate(overrides))
+    end
   end
 
-  def self.configuration(overrides = {})
-    {
-      :tweets_csv_path => 'tweets.csv',
-      :corpus_path     => 'markov_dict.txt',
-      :dictionary_name => 'dictionary', # don't include the .mmd
-      :twitter => {
-        :consumer_key       => '',
-        :consumer_secret    => '',
-        :oauth_token        => '',
-        :oauth_token_secret => ''
-      }
-    }.deep_merge(overrides)
-  end
-
-  def self.generate(overrides = {})
-    config = self.configuration(overrides)
-    generator = Ebooks::Generator.new(config)
-
-    generator.generate_sentence
-  end
-
-  def self.tweet(overrides = {})
-    config = self.configuration(overrides)
-
-    sentence = self.generate(overrides)
-
-    Ebooks::Twitter.new(config[:twitter]).tweet(sentence)
-  end
 end

data/lib/ebooks/generator.rb

@@ -14,11 +14,11 @@ module Ebooks
     def generate_twitter_corpus
       # Go to Twitter.com -> Settings -> Download Archive.
       # This tweets.csv file is in the top directory. Put it in the same directory as this script.
-      csv_text = CSV.parse(File.read(@tweets_csv_path))
+      csv_text = CSV.read(@tweets_csv_path)
 
       # Create a new clean file of text that acts as the seed for your Markov chains
       File.open(@corpus_path, 'w') do |file|
-        csv_text.reverse.each do |row|
+        csv_text.reverse_each do |row|
           # Strip links and new lines
           tweet_text = row[5].gsub(/(?:f|ht)tps?:\/[^\s]+/, '').gsub(/\n/,' ')
           # Save the text

data/lib/ebooks/twitter.rb

@@ -6,20 +6,21 @@ module Ebooks
       @consumer_secret     = credentials.fetch(:consumer_secret)
       @access_token        = credentials.fetch(:oauth_token)
       @access_token_secret = credentials.fetch(:oauth_token_secret)
+    end
 
-      ::Twitter.configure do |config|
-        config.consumer_key    = @consumer_key
-        config.consumer_secret = @consumer_secret
+    def twitter_client
+      ::Twitter::REST::Client.new do |config|
+        config.consumer_key        = @consumer_key
+        config.consumer_secret     = @consumer_secret
+        config.access_token        = @access_token
+        config.access_token_secret = @access_token_secret
       end
     end
 
     def tweet(tweet_text)
-      twitter_client = ::Twitter::Client.new(:oauth_token => @access_token,
-                                    :oauth_token_secret => @access_token_secret)
       tweet_text = tweet_text.gsub('@', '')[0..139]
       p "#{Time.now}: #{tweet_text}"
       twitter_client.update(tweet_text)
     end
-
   end
 end

data/lib/ebooks/version.rb

@@ -1,3 +1,3 @@
 module Ebooks
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: ebooks
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2014-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thread
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: marky_markov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   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'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 description: Generate your own horse_ebooks for fun and for profit
@@ -88,8 +88,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
+- History.markdown
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -110,17 +111,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: horse_ebooks with and without twitter