iknow 0.2.2 → 0.2.3

data/ChangeLog

@@ -28,6 +28,6 @@
 
 * maintenance release
 
-== 0.2.
+== 0.2.2
 
 * add attribution support for add_image & add_sound APIs

data/README

@@ -1,6 +1,6 @@
 = iknow
 
-  by nov <nmatake@cerego.co.jp>
+  by nov <developer@iknow.co.jp>
 
 == Description
 
@@ -40,6 +40,6 @@
 
 == Copyright
 
-Author::    nov <nmatake@cerego.co.jp>
+Author::    nov <developer@iknow.co.jp>
 Copyright:: Copyright (c) 2008 nov
 License::   MIT License

data/Rakefile

@@ -14,7 +14,7 @@ NAME              = "iknow"
 AUTHOR            = "nov"
 EMAIL             = "developer@iknow.co.jp"
 DESCRIPTION       = "A rubygem for iKnow! APIs"
-RUBYFORGE_PROJECT = "iknow"
+RUBYFORGE_PROJECT = NAME
 HOMEPATH          = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 BIN_FILES         = %w(  )
 
@@ -60,10 +60,9 @@ spec = Gem::Specification.new do |s|
 	#s.autorequire       = ""
 	s.test_files        = Dir["test/*_test.rb"]
 
-	s.add_dependency('rails', '>=2.1.0')
 	s.add_dependency('json')
-	s.add_dependency('oauth', '>=0.2.7')
-	s.required_ruby_version = '>= 1.8.6'
+	s.add_dependency('oauth')
+  # s.required_ruby_version = '>= 1.8.6'
 
 	s.files = %w(README ChangeLog Rakefile) +
 		Dir.glob("{bin,doc,test,lib,templates,extras,website,script}/**/*") + 

data/lib/iknow.rb

@@ -11,4 +11,6 @@ require 'json'
 require 'ext/hash'
 require 'iknow/core'
 require 'iknow/rest_client'
-require 'iknow/model'
+require 'iknow/model'
+
+Iknow::Config.init

data/lib/iknow/core/config.rb

@@ -2,9 +2,10 @@ require 'singleton'
 
 class Iknow::Config
   include Singleton
-  attr_accessor :protocol, :host, :port, :api_protocol, :api_host, :api_port, :api_key, :timeout,
-                :oauth_consumer_key, :oauth_consumer_secret, :oauth_http_method, :oauth_scheme,
-                :user_agent, :application_name, :application_version, :application_url
+  ATTRIBUTES = [ :protocol, :host, :port, :api_protocol, :api_host, :api_port, :api_key, :timeout,
+                 :oauth_consumer_key, :oauth_consumer_secret, :oauth_http_method, :oauth_scheme,
+                 :user_agent, :application_name, :application_version, :application_url ]
+  attr_accessor *ATTRIBUTES
 
   def self.init(&block)
     conf = Iknow::Config.instance
@@ -39,8 +40,12 @@ class Iknow::Config
     "#{self.api_protocol}://#{self.api_host}#{port}"
   end
 
-  def self.method_missing(method, *args)
-    self.instance.send(method, *args)
+  # hack: Object.timeout is already defined..
+  def self.timeout
+    instance.timeout
   end
 
-end
+  def self.method_missing(method, *args)
+    Iknow::Config.instance.send(method, *args)
+  end
+end

data/lib/iknow/core/version.rb

@@ -1,7 +1,7 @@
 module Iknow::Version
   MAJOR = 0
   MINOR = 2
-  REVISION = 2
+  REVISION = 3
   class << self
     def to_version
       "#{MAJOR}.#{MINOR}.#{REVISION}"

data/lib/iknow/model/list.rb

@@ -14,7 +14,7 @@
 #     "author_url": "http://www.iknow.co.jp/user/Cerego"
 
 class Iknow::List < Iknow::Base
-  ATTRIBUTES = [:id, :title, :description, :icon, :item_count, :user_count, :iknow, :dictation, :brainspeed,
+  ATTRIBUTES = [:id, :title, :description, :icon, :square_icon, :item_count, :user_count, :iknow, :dictation, :brainspeed,
                 :language, :translation_language, :list_type, :transcript, :embed,
                 :tags, :media_entry, :author, :author_id, :author_url, :attribution_license_id,
                 :items, :sentences]
@@ -64,6 +64,7 @@ class Iknow::List < Iknow::Base
     @title       = params[:title]
     @description = params[:description]
     @icon        = params[:icon]
+    @square_icon = params[:square_icon]
     @item_count  = (params[:item_count].to_i rescue nil)
     @user_count  = (params[:user_count].to_i rescue nil)
     @language    = params[:language]

data/lib/iknow/model/sentence.rb

@@ -1,5 +1,5 @@
 class Iknow::Sentence < Iknow::Base
-  ATTRIBUTES = [:sound, :image, :text, :language, :id, :transliterations, :translations, :item, :list]
+  ATTRIBUTES = [:sound, :image, :square_image, :text, :language, :id, :transliterations, :translations, :item, :list]
   READONLY_ATTRIBUTES = [:id]
   attr_accessor *(ATTRIBUTES - READONLY_ATTRIBUTES)
   attr_reader *READONLY_ATTRIBUTES
@@ -33,6 +33,7 @@ class Iknow::Sentence < Iknow::Base
     @list     = params[:list]
     @sound    = params[:sound]
     @image    = params[:image]
+    @square_image = params[:square_image]
     @text     = params[:text]
     @language = params[:language]
     @transliterations = params[:transliterations]

data/lib/iknow/model/user.rb

@@ -95,6 +95,7 @@ class Iknow::User < Iknow::Base
 
   def study(params = {})
     params[:application] ||= 'iknow'
+    return nil unless ['iknow', 'dictation', 'brainspeed', ].include?(params[:application])
     hash = Iknow::RestClient::User.study_results(params.merge(:username => self.username))
     self.deserialize(hash, :as => Iknow::User::Study)
   end

data/test/iknow_test.rb

@@ -2,4 +2,7 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 
 require "test/unit"
 class IknowTest < Test::Unit::TestCase
+  def test_truth
+    true
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: iknow
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - nov
@@ -9,19 +9,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-22 00:00:00 +09:00
+date: 2008-12-24 00:00:00 +09:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rails
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.1.0
-    version: 
 - !ruby/object:Gem::Dependency 
   name: json
   type: :runtime
@@ -40,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.7
+        version: "0"
     version: 
 description: A rubygem for iKnow! APIs
 email: developer@iknow.co.jp
@@ -103,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.8.6
+      version: "0"
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: