lapse 0.0.1 → 0.0.3

data/Gemfile

@@ -19,4 +19,9 @@ group :test do
   gem 'mocha', :require => 'mocha/setup'
   gem 'simplecov', :require => false
   gem 'hashie' #unknown why this is required for certain dev envs to work (ahem, adam)
+  gem 'm'
+  gem 'thor'
+  gem 'faraday'
+  gem 'faraday_middleware'
+  gem 'addressable'
 end

data/Readme.markdown

@@ -41,24 +41,11 @@ end
 
 A client takes an optional access token when you initialize it. If you don't provide one, you can still use it to make unauthenticated requests. If you do provide one, it will set the authorization header for all requests.
 
-``` ruby
-> client = Lapse::Client.new(access_token: 'your_access_token')
-> current_user = client.me
-> current_user.username
-#=> "soffes"
-> decision = client.decision(5, 3276)
-#=> "Which lamp for the new apartment?"
-> slug = client.slug('d/3I0n0g')
-> slug.decision.user.username
-#=> "soffes"
-```
 
 ## Supported Ruby Versions
 
 Lapse is tested under 1.8.7, 1.9.2, 1.9.3, 2.0.0, JRuby 1.7.2 (1.9 mode), and Rubinius 2.0.0 (1.9 mode).
 
-[![Build Status](https://travis-ci.org/seesawco/Lapse-rb.png?branch=master)](https://travis-ci.org/seesawco/Lapse-rb)
-
 ## Contributing
 
 See the [contributing guide](Contributing.markdown).

data/bin/lapse

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'lapse'
+require 'lapse/cli'
+
+Lapse::Cli.start(ARGV)

data/lapse.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 1.8.7'
   gem.add_dependency 'multi_json', '~> 1.6'
-  gem.add_dependency 'hashie', '~> 1.2.0'
+  gem.add_dependency 'hashie'
 end

data/lib/lapse/cli.rb

@@ -0,0 +1,206 @@
+require 'thor'
+require 'faraday'
+require 'faraday_middleware'
+require 'addressable/uri'
+require 'yaml'
+
+module Lapse
+  class Cli < Thor
+    desc 'signin', 'Signs the user in by passing in a twitter token'
+    def signin(host, token)
+      result = unauthenticated_client(host).authenticate(token)
+
+      self.auth_data = {
+        :access_token => result['access_token'],
+        :api_host => host
+      }
+
+      result = ["Signed in as #{result.user.username}"]
+      result << " on #{host}" if host
+      puts result.join('')
+    end
+
+    desc 'signout', 'Signs the user out'
+    def signout
+      File.delete config_file
+      puts 'Signed out'
+    end
+
+    desc 'create_clip', 'Creates a clip'
+    def create_clip(title, *image_paths)
+      clip = authenticated_client.create_clip
+      puts "Created clip id #{clip.id}"
+
+      frames = image_paths.map do |image_path|
+        upload_frame(clip.id, image_path)
+      end
+
+      authenticated_client.accept_frames(clip.id, frames.map(&:id))
+
+      puts 'Publishing clip'
+      authenticated_client.publish_clip(clip.id, title)
+
+      puts "#{api_host}/#{clip.slug}"
+    end
+
+    desc 'add_frame', 'Adds a frame to an existing clip'
+    option :url
+    method_option :open, :aliases => "-o", desc: "Open the clip"
+    def add_frame(clip_id)
+      file = get_frame(options[:url])
+      frame = upload_frame clip_id, file.path
+      clip = authenticated_client.accept_frames(clip_id, [frame.id])
+
+      url = "#{api_host}/#{clip.slug}"
+      if options[:open]
+        system "open #{url}"
+      else
+        system "echo #{url} | pbcopy"
+      end
+    end
+
+    desc 'photobooth', 'Runs a photobooth'
+    option :url
+    method_option :open, :aliases => "-o", desc: "Open the clip"
+    def photobooth(title, frame_count = 10)
+      clip = authenticated_client.create_clip
+
+      unless options[:url]
+        puts "Install imagesnap via \`brew install imagesnap\` to use your local camera."
+        return
+      end
+
+      frames = frame_count.to_i.times.map do |i|
+        file = get_frame(options[:url])
+        upload_frame clip.id, file.path
+      end
+
+      authenticated_client.accept_frames(clip.id, frames.map(&:id))
+
+      authenticated_client.publish_clip(clip.id, title)
+
+      url = "#{api_host}/#{clip.slug}"
+
+      if options[:open]
+        system "open #{url}"
+      else
+        system "echo #{url} | pbcopy"
+      end
+
+      puts "\n#{url}"
+    end
+
+    protected
+
+    def upload_frame(clip_id, image_path)
+      new_frame = authenticated_client.create_frame(clip_id)
+      file_upload = Faraday::UploadIO.new(image_path, 'image/jpeg')
+      params = new_frame.upload_params.to_hash.merge({'file' => file_upload })
+
+      conn = Faraday.new do |c|
+        c.use Faraday::Request::Multipart
+        c.adapter :net_http
+      end
+      response = conn.post(new_frame.upload_url, params)
+
+      if response.status == 303
+        conn.head response.headers['location']
+      else
+        raise response.body
+      end
+
+      putc '*'
+
+      new_frame
+    end
+
+    def download_image(url)
+      uri = Addressable::URI.parse(url)
+
+      conn = Faraday.new do |c|
+        #c.use FaradayMiddleware::FollowRedirects, limit: 3
+        c.adapter :net_http
+      end
+
+      if uri.user
+        conn.basic_auth(uri.user, uri.password)
+      end
+
+      response = conn.get(url)
+      validate_response(url, response)
+
+      convert_to_tempfile(response.body)
+    end
+
+    def validate_response(url, response)
+      raise "#{url} not found" if response.status == 404
+      raise "#{response.status} - #{response.body}" unless (200..300).include?(response.status)
+      raise "#{url} has no data" unless response.body.length > 10
+    end
+
+    def convert_to_tempfile(data)
+      file = Tempfile.open(['http', '.jpg'], encoding: 'BINARY')
+      file.write data
+      file.close
+      file
+    end
+
+    def get_frame(url = nil)
+      if url
+        file = download_image(url)
+      else
+        file = Tempfile.new(['photobooth', '.jpg'], encoding: 'BINARY')
+        system "imagesnap #{file.path} > /dev/null"
+      end
+    end
+
+    def unauthenticated_client(host = api_host)
+      options = {}.merge(server_options(host))
+      Lapse::Client.new(options)
+    end
+
+    def authenticated_client(host = api_host)
+      options = {:access_token => access_token}.merge(server_options(host))
+      Lapse::Client.new(options)
+    end
+
+    def server_options(host)
+      if host
+        uri = Addressable::URI.parse(host)
+        {:api_scheme => uri.scheme, :api_host => [uri.host, uri.port].compact.join(':')}
+      else
+        {}
+      end
+    end
+
+    def access_token
+      auth_data[:access_token]
+    end
+
+    def api_host
+      auth_data[:api_host]
+    end
+
+    def auth_data
+      @app_token ||= begin
+        if File.exist?(config_file)
+          YAML.load(File.open(config_file).read)
+        else
+          {}
+        end
+      end
+    end
+
+    def auth_data=(val)
+      @app_token = val
+      File.open(config_file, 'w+') do |f|
+        f.write(YAML.dump(val))
+      end
+      @app_token
+    end
+
+    def config_file
+      File.expand_path('~/.lapse')
+    end
+  end
+end

data/lib/lapse/client/clips.rb

@@ -0,0 +1,38 @@
+module Lapse
+  class Client
+    # Client methods for working with clips
+    module Clips
+      def all_clips
+        get('clips').body
+      end
+
+      def featured_clips
+        get('clips/featured').body
+      end
+
+      def create_clip
+        post('clips').body
+      end
+
+      def accept_frames(clip_id, frame_ids)
+        params = {
+          :frame_ids => frame_ids
+        }
+        post("clips/#{clip_id}/accept_frames", params).body
+      end
+
+      def publish_clip(clip_id, title)
+        params = {
+          :clip => {
+            :title => title
+          }
+        }
+        post("clips/#{clip_id}/publish", params).body
+      end
+
+      def destroy_clip(clip_id)
+        boolean_from_response(:delete, "clips/#{clip_id}")
+      end
+    end
+  end
+end

data/lib/lapse/client/frames.rb

@@ -0,0 +1,18 @@
+module Lapse
+  class Client
+    # Client methods for working with clips
+    module Frames
+      def clip_frames(clip_id)
+        get("clips/#{clip_id}/frames").body
+      end
+
+      def create_frame(clip_id)
+        post("clips/#{clip_id}/frames").body
+      end
+
+      def destroy_frame(clip_id, frame_id)
+        boolean_from_response(:delete, "clips/#{clip_id}/frames/#{frame_id}")
+      end
+    end
+  end
+end

data/lib/lapse/client/likes.rb

@@ -0,0 +1,8 @@
+module Lapse
+  class Client
+    # Client methods for working with clips
+    module Likes
+
+    end
+  end
+end

data/lib/lapse/client/user_timelines.rb

@@ -0,0 +1,21 @@
+module Lapse
+  class Client
+    module UserTimelines
+      def user_timeline(user_id, params = {})
+        get("users/#{user_id}/timelines/user", params).body
+      end
+
+      def user_likes_timeline(user_id, params = {})
+        get("users/#{user_id}/timelines/liked", params).body
+      end
+
+      def user_contributed_timeline(user_id, params = {})
+        get("users/#{user_id}/timelines/contributed", params).body
+      end
+
+      def user_contributors_timeline(user_id, params = {})
+        get("users/#{user_id}/timelines/contributors", params).body
+      end
+    end
+  end
+end

data/lib/lapse/client/users.rb

@@ -0,0 +1,41 @@
+module Lapse
+  class Client
+    # Client methods for working with users
+    module Users
+      # Authenticates a user
+      #
+      # Requires authenticatied client.
+      #
+      # @return [Hashie::Mash]
+      # @see Lapse::Client
+      # @example
+      #   client.me
+      def authenticate(twitter_access_token)
+        result = post('authenticate', twitter_access_token: twitter_access_token)
+        hash = {
+          :user => result.body,
+          :access_token => result.headers['x-access-token']
+        }
+
+        case @result_format
+        when :mashie
+          Hashie::Mash.new(hash)
+        else
+          hash
+        end
+      end
+
+      # Get the current user
+      #
+      # Requires authenticatied client.
+      #
+      # @return [Hashie::Mash]
+      # @see Totter::Client
+      # @example
+      #   client.me
+      def me
+        get('me').body
+      end
+    end
+  end
+end

data/lib/lapse/client.rb

@@ -6,11 +6,16 @@ module Lapse
   class Client
     Dir[File.expand_path('../client/*.rb', __FILE__)].each { |f| require f }
 
+    include Clips
     include Configuration
+    include Frames
+    include Users
+    include UserTimelines
 
     attr_reader :access_token
     attr_reader :api_scheme
     attr_reader :api_host
+    attr_reader :api_prefix
     attr_reader :api_version
     attr_reader :transport
     attr_reader :result_format
@@ -20,6 +25,7 @@ module Lapse
       :api_scheme => 'https',
       :api_host => 'everlapse.com',
       :api_version => '1',
+      :api_prefix => 'api',
       :result_format => :mashie,
       :transport => :http
     }
@@ -57,6 +63,7 @@ module Lapse
       @api_scheme = options[:api_scheme]
       @api_host = options[:api_host]
       @api_version = options[:api_version]
+      @api_prefix = options[:api_prefix]
       @client_token = options[:client_token] if options[:client_token]
       @transport = options[:transport]
       @result_format = options[:result_format]
@@ -71,7 +78,7 @@ module Lapse
     #
     # @return [String] API base URL
     def base_url
-      "#{@api_scheme}://#{@api_host}/v#{@api_version}/"
+      "#{@api_scheme}://#{@api_host}/#{@api_prefix}/v#{@api_version}/"
     end
 
     # Is the client has an access token.

data/lib/lapse/transport/http.rb

@@ -44,7 +44,7 @@ module Lapse
         response = http.request(request)
 
         # Check for errors
-        handle_error(response)
+        handle_error(request, response)
 
         # Return the raw response object
         response
@@ -84,14 +84,14 @@ module Lapse
         end
       end
 
-      def handle_error(response)
+      def handle_error(request, response)
         # Find error or return
         return unless error = Lapse::ERROR_MAP[response.code.to_i]
 
         # Try to add a useful message
         message = nil
         begin
-          message = MultiJson.load(response.body)['error_description']
+          message = MultiJson.load(response.body)['error_description'] || request.path
         rescue MultiJson::DecodeError => e
         end
 

data/lib/lapse/version.rb

@@ -1,4 +1,4 @@
 module Lapse
   # Verion of the Lapse gem
-  VERSION = '0.0.1'
+  VERSION = '0.0.3'
 end

data/test/lapse/client/clips_test.rb

@@ -0,0 +1,35 @@
+require 'test_helper'
+
+class ClipsTest < Lapse::TestCase
+
+  def test_all_clips
+    stub_request(:get, 'https://everlapse.com/api/v1/clips').to_return(:status => 200, :body => "[]")
+    assert_equal [], authenticated_client.all_clips
+  end
+
+  def test_featured_clips
+    stub_request(:get, 'https://everlapse.com/api/v1/clips/featured').to_return(:status => 200, :body => "[]")
+    assert_equal [], authenticated_client.featured_clips
+  end
+
+  def test_create_clip
+    stub_request(:post, 'https://everlapse.com/api/v1/clips').to_return(:status => 200, :body => "{}")
+    assert_equal Hash.new, authenticated_client.create_clip
+  end
+
+   def test_accept_frames
+    stub_request(:post, 'https://everlapse.com/api/v1/clips/1/accept_frames').to_return(:status => 200, :body => "{}")
+    assert_equal Hash.new, authenticated_client.accept_frames(1, [1, 2, 3, 4])
+  end
+
+  def test_publish_clip
+    stub_request(:post, 'https://everlapse.com/api/v1/clips/1/publish').to_return(:status => 200, :body => "{}")
+    assert_equal Hash.new, authenticated_client.publish_clip(1)
+  end
+
+  def test_destroy_clip
+    stub_request(:delete, 'https://everlapse.com/api/v1/clips/1').to_return(:status => 200)
+    assert authenticated_client.destroy_clip(1)
+  end
+
+end

data/test/lapse/client/frames_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+class FramesTest < Lapse::TestCase
+
+  def test_clip_frames
+    stub_request(:get, 'https://everlapse.com/api/v1/clips/1/frames').to_return(:status => 200, :body => "[]")
+    assert_equal [], authenticated_client.clip_frames(1)
+  end
+
+  def test_create_frame
+    stub_request(:post, 'https://everlapse.com/api/v1/clips/1/frames').to_return(:status => 200, :body => "{}")
+    assert_equal Hash.new, authenticated_client.create_frame(1)
+  end
+
+  def test_destroy_frame
+    stub_request(:delete, 'https://everlapse.com/api/v1/clips/1/frames/2').to_return(:status => 200)
+    assert authenticated_client.destroy_frame(1, 2)
+  end
+
+end

data/test/lapse/client/users_test.rb

@@ -0,0 +1,19 @@
+require 'test_helper'
+
+class UsersTest < Lapse::TestCase
+  def test_authenticate
+    key = 'test_key'
+
+    stub_request(:post, 'https://everlapse.com/api/v1/authenticate').with(:body => "{\"twitter_access_token\":\"#{key}\"}").
+      to_return(:status => 200, :body => "{}", :headers => {"x-access-token" => 'fake_token'})
+
+    result = unauthenticated_client.authenticate(key)
+    assert_equal Hash.new, result.user
+    assert_equal 'fake_token', result.access_token
+  end
+
+  def test_me
+    stub_request(:get, 'https://everlapse.com/api/v1/me').to_return(:status => 200, :body => "{}")
+    assert_equal Hash.new, authenticated_client.me
+  end
+end

data/test/lapse/client_test.rb

@@ -15,16 +15,19 @@ class ClientTest < Lapse::TestCase
 
   def test_base_url
     client = Lapse::Client.new
-    assert_equal 'https://everlapse.com/v1/', client.base_url
+    assert_equal 'https://everlapse.com/api/v1/', client.base_url
 
     client = Lapse::Client.new(:api_scheme => 'http', :api_host => 'example.com', :api_version => 42)
-    assert_equal 'http://example.com/v42/', client.base_url
+    assert_equal 'http://example.com/api/v42/', client.base_url
 
     client = Lapse::Client.new(:api_url => 'http://example.com')
-    assert_equal 'http://example.com/v1/', client.base_url
+    assert_equal 'http://example.com/api/v1/', client.base_url
 
     client = Lapse::Client.new(:api_url => 'http://localhost:3000')
-    assert_equal 'http://localhost:3000/v1/', client.base_url
+    assert_equal 'http://localhost:3000/api/v1/', client.base_url
+
+    client = Lapse::Client.new(:api_prefix => 'asd')
+    assert_equal 'https://everlapse.com/asd/v1/', client.base_url
   end
 
   def test_ssl?

data/test/lapse/transport/http_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class HttpTest < Lapse::TestCase
   def test_default_mashie_format
-    stub_request(:get, 'https://everlapse.com/v1/configuration').to_return(status: 200, body: "{}")
+    stub_request(:get, 'https://everlapse.com/api/v1/configuration').to_return(:status => 200, :body => "{}")
     assert_equal Hashie::Mash, Lapse.configuration.class
   end
 end

data/test/support/client_macros.rb

@@ -1,9 +1,9 @@
 module ClientMacros
-  def local_client
-    client = Lapse::Client.new(:access_token => '9774e653f7b3c1de5f21b61adc08ba24', :api_host => 'localhost:5000', :api_scheme => 'http')
+  def authenticated_client
+    Lapse::Client.new(:access_token => 'access_token')
   end
 
-  def unauthenticated_monkeybars_production_client
-    Lapse::Client.new(:client_token => '29756b7591819c57e01ac2c6d9ae5311')
+  def unauthenticated_client
+    Lapse::Client.new
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lapse
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -34,23 +34,24 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
 description: Ruby gem for working with the Everlapse API.
 email:
 - sam@soff.es
 - gotwalt@gmail.com
 - adam.g.ryan@gmail.com
-executables: []
+executables:
+- lapse
 extensions: []
 extra_rdoc_files: []
 files:
@@ -61,15 +62,25 @@ files:
 - LICENSE
 - Rakefile
 - Readme.markdown
+- bin/lapse
 - lapse.gemspec
 - lib/lapse.rb
+- lib/lapse/cli.rb
 - lib/lapse/client.rb
+- lib/lapse/client/clips.rb
 - lib/lapse/client/configuration.rb
+- lib/lapse/client/frames.rb
+- lib/lapse/client/likes.rb
+- lib/lapse/client/user_timelines.rb
+- lib/lapse/client/users.rb
 - lib/lapse/error.rb
 - lib/lapse/response.rb
 - lib/lapse/transport.rb
 - lib/lapse/transport/http.rb
 - lib/lapse/version.rb
+- test/lapse/client/clips_test.rb
+- test/lapse/client/frames_test.rb
+- test/lapse/client/users_test.rb
 - test/lapse/client_test.rb
 - test/lapse/transport/http_test.rb
 - test/lapse_test.rb
@@ -96,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3688395446889741402
+      hash: -4262868761146380689
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -104,6 +115,9 @@ signing_key:
 specification_version: 3
 summary: Ruby gem for working with the Everlapse API.
 test_files:
+- test/lapse/client/clips_test.rb
+- test/lapse/client/frames_test.rb
+- test/lapse/client/users_test.rb
 - test/lapse/client_test.rb
 - test/lapse/transport/http_test.rb
 - test/lapse_test.rb