lingq 0.1.4 → 0.2.0

data/Gemfile

@@ -5,6 +5,7 @@ gem "httparty"
 
 group(:test){
   gem "test-unit"
+  gem "mocha"
   gem "thoughtbot-shoulda"
   gem "webmock"
 }

data/README.rdoc

@@ -17,10 +17,13 @@ You need the API key for your account.  Usage is as follows:
   
   #load all lingq flashcards for the user
   words = client.words
+  
+  #load only the flashcards for a single lesson
+  words = lessons.first.words
 
 == Current Status
 
-Right now just data pulling is done.  Will add soon the ability to update lingqs and load lingqs by lesson.
+Right now just data pulling is done.  Will add soon the ability to update lingqs.
 
 == Note on Patches/Pull Requests
  

data/Rakefile

@@ -43,7 +43,8 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
+#dont need this, we're using bundler
+#task :test => :check_dependencies
 
 task :default => :test
 

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.2.0

data/lib/lingq/client.rb

@@ -27,13 +27,18 @@ module Lingq
     end
     
     def lessons
-      get_with_language("lessons/").map{|hash| Lingq::Lesson.new(@target_language,hash)}
+      get_with_language("lessons/").map{|hash| Lingq::Lesson.new(self,@target_language,hash)}
     end
     
     def words
       get_with_language("lingqs/").map{|hash| Lingq::Word.new(@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)}
+    end
+    
   private
     def get_with_key(path,params={})
       self.class.get(path,{:query=>params.merge({:apikey=>@apikey})})

data/lib/lingq/lesson.rb

@@ -1,7 +1,8 @@
 module Lingq
   class Lesson
-    attr_reader :audio_url,:image_url,:id,:cards_count,:title,:language
-    def initialize(language_code,json)
+    attr_reader :audio_url,:image_url,:id,:cards_count,:title,:language,:lingq_client
+    def initialize(client,language_code,json)
+      @lingq_client = client
       @language = language_code
       @audio_url = json["audio_url"]
       @image_url = json["image_url"]
@@ -9,5 +10,10 @@ module Lingq
       @cards_count = json["cards_count"]
       @title = json["title"]
     end
+    
+    def words
+      return @words if @words
+      @words = @lingq_client.words_for_lesson(self)
+    end
   end
 end

data/lingq.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lingq}
-  s.version = "0.1.4"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ethan Vizitei"]

data/test/helper.rb

@@ -4,6 +4,7 @@ Bundler.setup(:default,:test)
 require 'test/unit'
 require 'shoulda'
 require 'webmock/test_unit'
+require 'mocha'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/test_client.rb

@@ -68,6 +68,27 @@ class TestClient < Test::Unit::TestCase
         assert_equal 5,@words.size
       end
     end
+    
+    context "prebuilt client for words from lesson call" do
+      setup do
+        body = %Q{[ { "status": 0, "fragment": "вперед и вы найдете его .", "term": "Его", "id": 4259928, "hint": "him" }, 
+          { "status": 0, "fragment": "Официант, принесите нам счет , пожалуйста", "term": "Счет", "id": 4259923, "hint": "check " }, 
+          { "status": 0, "fragment": "Легко сказать да трудно сделать.", "term": "трудно", "id": 4259919, "hint": "difficult" }, 
+          { "status": 0, "fragment": "Легко сказать да трудно сделать.", "term": "Легко", "id": 4259916, "hint": "easily" }, 
+          { "status": 0, "fragment": "стараться делать это с радостью .", "term": "радостью", "id": 4259915, "hint": "joy" }]}
+        @lesson = Lingq::Lesson.new(@client,"ru",{"id"=> 123})
+        stub_api("ru/123/lingqs",body)
+        @words = @client.words_for_lesson(@lesson)
+      end
+      
+      should "load an array of lessons" do
+        assert_equal Lingq::Word,@words.first.class
+      end
+      
+      should "load one lesson for each json hash" do
+        assert_equal 5,@words.size
+      end
+    end
   end
   
   def stub_api(path,body)

data/test/test_lesson.rb

@@ -3,7 +3,9 @@ require 'helper'
 class TestLesson < Test::Unit::TestCase
   context "lesson" do
     setup do
-      @lesson = Lingq::Lesson.new("ru",{"audio_url"=>"http://m.lingq.com/media/_28/resources/contents/audio/2007/06/21/eating-out-3.mp3", 
+      Lingq::Client.any_instance.stubs(:load_languages!)
+      @client = Lingq::Client.new("apikey")
+      @lesson = Lingq::Lesson.new(@client,"ru",{"audio_url"=>"http://m.lingq.com/media/_28/resources/contents/audio/2007/06/21/eating-out-3.mp3", 
                                    "image_url"=>"http://m.lingq.com/media/_28/resources/contents/images/2008/08/26/Eating_Out_______.jpg", 
                                    "id"=> 21730, "cards_count"=> 31, "title"=> "Part 3" })
     end
@@ -31,5 +33,22 @@ class TestLesson < Test::Unit::TestCase
     should "cache language" do
       assert_equal "ru",@lesson.language
     end
+    
+    should "cache the client that created it" do
+      assert_equal @client,@lesson.lingq_client
+    end
+    
+    context "loading words" do
+      setup do
+        @client.expects(:words_for_lesson).with(@lesson).returns([Lingq::Word.new("ru",{})])
+        @words = @lesson.words
+      end
+      
+      should "load words from client" do
+        assert_equal Lingq::Word,@words.first.class
+        assert_equal @lesson.language,@words.first.language
+        assert_equal 1,@words.size
+      end
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lingq
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 4
-  version: 0.1.4
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Ethan Vizitei