sched 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23c303ccaa1abf47d80c0e66ecdcd5044e7acfa5
-  data.tar.gz: 637269c9b81d68c09031db277fdf2b56cd243ae5
+  metadata.gz: a101c3e618eec8f111d51642695e6d38452d3d63
+  data.tar.gz: cfadcf4667315d5bc00719ce1585350f99966bdb
 SHA512:
-  metadata.gz: 1350978bd368d155e41fffae95964fcd9b0b004c07ad901a6e3830e12d2f77ca61d9a77d8df2db8c579364f8b98cea4df3e8fc472a361d9751b2eb69243396e3
-  data.tar.gz: 934cc6c4eaa5c21d29eec2364b7e644b9cf17a3817ecb960a30cff39c6eb9edb1c85360f5e7e356c6dbe4519887dbeb8cd8a4fe8f35ff58193acdb7c7a5f1960
+  metadata.gz: 281baf4229bb7e1794b1a77420b725a579f6607d4851e824a8644caac250ea831e8ffac70196a69ee1952640eb7ed5c5e349dcc296ce46c81a964628cb8ca016
+  data.tar.gz: 8281be80bcc4fab4c4208f186fe0c52a172d94d6fc7bfee3f1858cca7eb7cd6fb56668828cce988afede58e669113f5189492319472df6ad6912ed54ecf561d8

data/{README.rdoc → README.md}

@@ -1,7 +1,7 @@
-= SCHED*
+# SCHED*
 
 Thirt-party Ruby client library for the SCHED* API. See http://sched.org
 
-== Copyright
+## Copyright
 
 Copyright (c) 2010 Manual design. See LICENSE for details.

data/lib/sched/client.rb

@@ -2,59 +2,73 @@ module Sched
   class Client
     attr_accessor :conference, :api_key
     def initialize(conference, api_key)
-      @conference, @api_key = conference, api_key
+      @conference = conference
+      @api_key = api_key
     end
 
     def event(session_key)
       event = Sched::Event.new(session_key, self)
-      if event.exists?
-        event = self.events.select{|e| e.session_key == session_key}.first
-      end
+      event = events.find { |e| e.session_key == session_key } if event.exists?
       event
     end
 
     def events
-      unless @events
-        results = FasterCSV.parse(request('session/list', nil, :get))
-
-        attributes = results.shift.map do |a|
-          a.strip.gsub(/[\u0080-\u00ff]/, "").gsub(/^event_/, "session_").to_sym
-        end
-
-        @events = results.map do |row|
-          row_hash = {}
-          attributes.each_with_index do |a, i|
-            row_hash[a] = row[i]
-          end
-          Sched::Event.new(row_hash[:session_key], self).configure(row_hash)
-        end
-      end
-      @events
+      @events ||= parse_sessions(CSV.parse(request("session/list", nil, :get)))
     end
 
     def api_url
       "http://#{@conference}.sched.org/api"
     end
 
-    def request(sub_url, data={}, method = :post)
+    def request(path, data = {}, method = :post)
       data ||= {}
-      data.merge!({:api_key => @api_key})
-      url = "#{api_url}/#{sub_url}"
-      output = nil
+      data[:api_key] = @api_key
       if method == :post
-        post_fields = data.map{|key, value| Curl::PostField.content(key.to_s, value)}
-        c = Curl::Easy.new(url)
-        c.headers["User-Agent"] = "sched-gem"
-        c.http_post(post_fields)
-        output = c.body_str
+        post_request(path, data)
       elsif method == :get
-        get_attributes = data.map{|key, value| "#{key}=#{value}" }.join("&")
-        c = Curl::Easy.new("#{url}?#{get_attributes}")
-        c.headers["User-Agent"] = "sched-gem"
-        c.perform
-        output = c.body_str
+        get_request(path, data)
+      end
+    end
+
+    private
+
+    def curl_client(path)
+      c = Curl::Easy.new("#{api_url}/#{path}")
+      c.headers["User-Agent"] = "sched-gem"
+      c
+    end
+
+    def full_url(path)
+      "#{api_url}/#{path}"
+    end
+
+    def get_request(path, data)
+      get_attributes = data.map { |key, value| "#{key}=#{value}" }.join("&")
+      c = curl_client("#{path}?#{get_attributes}")
+      c.perform
+      c.body_str
+    end
+
+    def parse_sessions(results)
+      attributes = results.shift.map do |a|
+        a.strip.gsub(/[\u0080-\u00ff]/, "").gsub(/^event_/, "session_").to_sym
+      end
+      results.map do |row|
+        row_hash = {}
+        attributes.each_with_index do |a, i|
+          row_hash[a] = row[i]
+        end
+        Sched::Event.new(row_hash[:session_key], self).configure(row_hash)
+      end
+    end
+
+    def post_request(path, data)
+      post_fields = data.map do |key, value|
+        Curl::PostField.content(key.to_s, value)
       end
-      output
+      c = curl_client(path)
+      c.http_post(post_fields)
+      c.body_str
     end
   end
 end

data/lib/sched/event.rb

@@ -4,25 +4,24 @@ module Sched
       # Required
       :session_key, :name, :session_start, :session_end, :session_type,
       # Optional
-      :session_subtype, :description, :panelists, :url, :media_url, :venue, :address, :map, :tags, :active
-    ]
-    SCHED_ATTRIBUTES.each{ |attribute| attr_accessor attribute }
+      :session_subtype, :description, :panelists, :url, :media_url, :venue,
+      :address, :map, :tags, :active
+    ].freeze
+    SCHED_ATTRIBUTES.each { |attribute| attr_accessor attribute }
     attr_accessor :client
 
-    def initialize(session_key, client=nil)
+    def initialize(session_key, client = nil)
       @session_key = session_key
       @client = client
     end
 
     def get_attribute(key)
-      self.send("#{key}")
+      send(key.to_s)
     end
 
-    def configure(options={})
+    def configure(options = {})
       options.each do |key, value|
-        if SCHED_ATTRIBUTES.include?(key)
-          self.send("#{key.to_s}=", value)
-        end
+        send("#{key}=", value) if SCHED_ATTRIBUTES.include?(key)
       end
       self
     end
@@ -30,38 +29,37 @@ module Sched
     def data
       data = {}
       SCHED_ATTRIBUTES.each do |attribute|
-        unless self.get_attribute(attribute) === nil
-          value = self.get_attribute(attribute)
-          value = 'Y' if value === true
-          value = 'N' if value === false
-          data[attribute] = value
-        end
+        next if get_attribute(attribute).nil?
+        value = get_attribute(attribute)
+        value = "Y" if value == true
+        value = "N" if value == false
+        data[attribute] = value
       end
       data
     end
 
     def save
-      if self.exists?
-        self.update
+      if exists?
+        update
       else
-        self.create
+        create
       end
     end
 
     def create
-      self.client.request('session/add', self.data)
+      client.request("session/add", data)
     end
 
     def update
-      self.client.request('session/mod', self.data)
+      client.request("session/mod", data)
     end
 
     def exists?
-      client.events.map{|e| e.session_key}.include?(self.session_key) ? true : false
+      client.events.map(&:session_key).include?(session_key) ? true : false
     end
 
     def destroy
-      self.client.request('session/del', {:session_key => self.session_key})
+      client.request("session/del", session_key: session_key)
     end
   end
 end

data/lib/sched/version.rb

@@ -1,5 +1,3 @@
 module Sched
-  unless Sched.const_defined?('VERSION')
-    VERSION = "0.1.6"
-  end
+  VERSION = "0.1.7".freeze unless Sched.const_defined?("VERSION")
 end

data/lib/sched.rb

@@ -1,5 +1,5 @@
-require 'curb'
-require 'fastercsv'
+require "csv"
+require "curb"
 
-require 'sched/client'
-require 'sched/event'
+require "sched/client"
+require "sched/event"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sched
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Inge Jørgensen
@@ -14,48 +14,27 @@ dependencies:
   name: curb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fastercsv
-  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'
+        version: 0.9.3
 description: SCHED* (http://sched.org) API client library for Ruby
 email: inge@manualdesign.no
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- Gemfile
-- Gemfile.lock
-- LICENSE
-- README.rdoc
+- README.md
 - lib/sched.rb
 - lib/sched/client.rb
 - lib/sched/event.rb
 - lib/sched/version.rb
-- sched.gemspec
-- test/helper.rb
-- test/test_sched.rb
 homepage: http://github.com/elektronaut/sched
 licenses:
 - MIT
@@ -79,7 +58,6 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: SCHED* (http://sched.org) API client library for Ruby
-test_files:
-- test/helper.rb
-- test/test_sched.rb
+summary: SCHED* API client library for Ruby
+test_files: []
+has_rdoc: 

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC

data/Gemfile

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-gem "rake"

data/Gemfile.lock

@@ -1,20 +0,0 @@
-PATH
-  remote: .
-  specs:
-    sched (0.1.6)
-      curb
-      fastercsv
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    curb (0.8.8)
-    fastercsv (1.5.5)
-    rake (10.4.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rake
-  sched!

data/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2010 Manual design
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/sched.gemspec

@@ -1,25 +0,0 @@
-# encoding: utf-8
-
-$:.push File.expand_path("../lib", __FILE__)
-require "sched/version"
-
-Gem::Specification.new do |s|
-  s.name        = 'sched'
-  s.version     = Sched::VERSION
-  s.date        = '2014-01-20'
-  s.summary     = "SCHED* (http://sched.org) API client library for Ruby"
-  s.description = "SCHED* (http://sched.org) API client library for Ruby"
-  s.authors     = ["Inge Jørgensen"]
-  s.email       = 'inge@manualdesign.no'
-  s.homepage    = 'http://github.com/elektronaut/sched'
-  s.license     = 'MIT'
-  s.required_ruby_version = Gem::Requirement.new(">= 1.9.2")
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-
-  s.add_dependency 'curb'
-  s.add_dependency 'fastercsv'
-end

data/test/helper.rb

@@ -1,10 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'sched'
-
-class Test::Unit::TestCase
-end

data/test/test_sched.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestSched < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end