lingq 0.2.1 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/lingq/client.rb

@@ -31,15 +31,26 @@ module Lingq
     end
     
     def words
-      get_with_language("lingqs/").map{|hash| Lingq::Word.new(@target_language,hash)}
+      get_with_language("lingqs/").map{|hash| Lingq::Word.new(self,@target_language,hash)}
     end
     
     def words_for_lesson(lesson)
       change_language!(lesson.language)
-      get_with_language("#{lesson.id}/lingqs/").map{|hash| Lingq::Word.new(@target_language,hash)}
+      get_with_language("#{lesson.id}/lingqs/").map{|hash| Lingq::Word.new(self,@target_language,hash)}
+    end
+    
+    def update_word!(word)
+      #put_with_language("lingqs/",word.params)
+      
+      ##TODO: This is a horrible awful hack, but until I can figure out how to get httparty to PUT this data properly, it will function
+      system_call("curl -X PUT -d 'id=#{word.id};status=#{word.status};hint=#{word.hint};fragment=#{word.fragment}' http://www.lingq.com/api_v2/#{@target_language}/lingqs/?apikey=#{@apikey}")
     end
     
   private
+    def system_call(call)
+      system(call)
+    end
+  
     def get_with_key(path,params={})
       self.class.get(path,{:query=>params.merge({:apikey=>@apikey})})
     end
@@ -47,5 +58,21 @@ module Lingq
     def get_with_language(path,params={})
       get_with_key("/#{@target_language}/#{path}",params)
     end
+  
+    def post_with_key(path,params={})
+      self.class.post(path,{:body=>params,:query=>{:apikey=>@apikey}})
+    end
+    
+    def post_with_language(path,params={})
+      post_with_key("/#{@target_language}/#{path}",params)
+    end
+    
+    def put_with_key(path,params={})
+      self.class.put(path,{:body=>params,:query=>{:apikey=>@apikey}})
+    end
+    
+    def put_with_language(path,params={})
+      put_with_key("/#{@target_language}/#{path}",params)
+    end
   end
 end

data/lib/lingq/word.rb

@@ -1,7 +1,8 @@
 module Lingq
   class Word
-    attr_reader :hint,:term,:id,:fragment,:status,:language
-    def initialize(language_code,json)
+    attr_accessor :hint,:term,:id,:fragment,:status,:language
+    def initialize(client,language_code,json)
+      @lingq_client = client
       @language = language_code
       @hint = json["hint"]
       @term = json["term"]
@@ -9,5 +10,14 @@ module Lingq
       @fragment = json["fragment"]
       @status = json["status"]
     end
+    
+    def params
+      {:id=>@id,:hint=>@hint,:fragment=>@fragment,:status=>@status}
+    end
+    
+    def increment_status!
+      @status += 1
+      @lingq_client.update_word!(self)
+    end
   end
 end

data/lingq.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lingq}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ethan Vizitei"]
-  s.date = %q{2010-06-19}
+  s.date = %q{2010-06-21}
   s.description = %q{Gem for interacting with the API of lingq.com.  It's a language learning website, and it's pretty useful, but I want to be able to work on my flashcards offline.  This gem is being written to be included in a desktop client (and maybe eventually a mobile client), but will certainly still be useful as a standalone api wrapper for other projects that want to interact with Lingq.com}
   s.email = %q{ethan.vizitei@gmail.com}
   s.extra_rdoc_files = [

data/test/test_client.rb

@@ -89,9 +89,28 @@ class TestClient < Test::Unit::TestCase
         assert_equal 5,@words.size
       end
     end
+    
+    context "prebuilt client for updating a word" do
+      setup do
+        stub_regex_api(/ru\/lingqs/,"",:put)
+        @word = Lingq::Word.new(@client,"ru",{ "status"=> 0, "fragment"=> "fragment", "term"=> "Его", "id"=> 4259928, "hint"=> "him" })
+        @word.status = 1
+        @client.expects(:system_call).with("curl -X PUT -d 'id=4259928;status=1;hint=him;fragment=fragment' http://www.lingq.com/api_v2/ru/lingqs/?apikey=api-key")
+        @client.update_word!(@word)
+      end
+
+      should "not bomb" do
+        assert true
+      end
+    end
+  end
+  
+  
+  def stub_api(path,body,method = :any)
+    stub_request(method, "http://lingq.com/api_v2/#{path}/?apikey=api-key").to_return(:body => body, :status => 200,  :headers => { 'Content-Type' => "application/json; charset=utf-8" } )
   end
   
-  def stub_api(path,body)
-    stub_request(:any, "http://lingq.com/api_v2/#{path}/?apikey=api-key").to_return(:body => body, :status => 200,  :headers => { 'Content-Type' => "application/json; charset=utf-8" } )
+  def stub_regex_api(regex,body,method = :any)
+    stub_request(method, regex).to_return(:body => body, :status => 200,  :headers => { 'Content-Type' => "application/json; charset=utf-8" } )
   end
 end

data/test/test_lesson.rb

@@ -40,7 +40,7 @@ class TestLesson < Test::Unit::TestCase
     
     context "loading words" do
       setup do
-        @client.expects(:words_for_lesson).with(@lesson).returns([Lingq::Word.new("ru",{})])
+        @client.expects(:words_for_lesson).with(@lesson).returns([Lingq::Word.new(@client,"ru",{})])
         @words = @lesson.words
       end
       

data/test/test_word.rb

@@ -3,7 +3,9 @@ require 'helper'
 class TestWord < Test::Unit::TestCase
   context "word" do
     setup do
-      @word = Lingq::Word.new("ru",{ "status"=> 0, 
+      Lingq::Client.any_instance.stubs(:load_languages!)
+      @client = Lingq::Client.new("apikey")
+      @word = Lingq::Word.new(@client,"ru",{ "status"=> 0, 
                                      "fragment"=> "вперед и вы найдете его .",
                                      "term"=> "Его", 
                                      "id"=> 4259928, 
@@ -33,5 +35,11 @@ class TestWord < Test::Unit::TestCase
     should "cache language" do
       assert_equal "ru",@word.language
     end
+    
+    should "be able to update status with builtin client" do 
+      @client.expects(:update_word!).with(@word)
+      @word.increment_status!
+      assert_equal 1,@word.status
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lingq
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Ethan Vizitei
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-19 00:00:00 -05:00
+date: 2010-06-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency