zedlocales 1.1.0 → 1.1.1

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/test/helper.rb

@@ -36,10 +36,10 @@ class Test::Unit::TestCase
     end
     @uu = Zedkit::Users.verify(:username => TEST_GEMS_LOGIN, :password => TEST_GEMS_PASSWORD)
   end
-  
+
   protected
   def con_sections
-    Zedkit::Projects.content_sections(:user_key => @uu['user_key'], :project => { :uuid => @uu['projects'][0] })['sections']
+    Zedkit::Projects.content_sections(:user_key => @uu['user_key'], :project => { :uuid => @uu['projects'][0] })
   end
   def con_scopes
     Zedlocales::ContentSections.scopes(:user_key => @uu['user_key'], :section => { :uuid => con_sections[0]['uuid'] })

data/test/test_content.rb

@@ -19,17 +19,16 @@ require 'helper'
 
 class TestContent < Test::Unit::TestCase
   def test_get_content
-    cs = Zedlocales::ContentScopes.content(:user_key => @uu['user_key'],
-                                           :scope => { :uuid => con_scopes['scopes'][0]['uuid'] })
-    cc = Zedlocales::Content.get(:user_key => @uu['user_key'], :uuid => cs['content'][0]['uuid'])
+    cs = Zedlocales::ContentScopes.content(:user_key => @uu['user_key'], :scope => { :uuid => con_scopes[0]['uuid'] })
+    cc = Zedlocales::Content.get(:user_key => @uu['user_key'], :uuid => cs[0]['uuid'])
     assert_equal 'whatever', cc['key']
-    assert_equal cs['content'][0]['uuid'], cc['uuid']
+    assert_equal cs[0]['uuid'], cc['uuid']
   end
   
   
   def test_create_content
-    cc = Zedlocales::Content.create(:user_key => @uu['user_key'], :scope => { :uuid => con_scopes['scopes'][0]['uuid'] },
-                                                                 :content => { :key => 'yo', :content => 'yo yo' })
+    cc = Zedlocales::Content.create(:user_key => @uu['user_key'], :scope => { :uuid => con_scopes[0]['uuid'] },
+                                                                  :content => { :key => 'yo', :content => 'yo yo' })
     assert_equal 32, cc['uuid'].length
     assert_equal 'yo', cc['key']
     assert_equal 'yo yo', cc['content']
@@ -37,28 +36,24 @@ class TestContent < Test::Unit::TestCase
   
   
   def test_update_content
-    cs = Zedlocales::ContentScopes.content(:user_key => @uu['user_key'],
-                                           :scope => { :uuid => con_scopes['scopes'][0]['uuid'] })
-    cc = Zedlocales::Content.update(:user_key => @uu['user_key'],
-                                    :uuid => cs['content'][0]['uuid'], :content => { :content => 'yo' })
-    assert_equal cs['content'][0]['uuid'], cc['uuid']
+    cs = Zedlocales::ContentScopes.content(:user_key => @uu['user_key'], :scope => { :uuid => con_scopes[0]['uuid'] })
+    cc = Zedlocales::Content.update(:user_key => @uu['user_key'], :uuid => cs[0]['uuid'], :content => { :content => 'yo' })
+    assert_equal cs[0]['uuid'], cc['uuid']
     assert_equal 'whatever', cc['key']
     assert_equal 'yo', cc['content']
   end
 
 
   def test_destroy_content
-    cs = Zedlocales::ContentScopes.content(:user_key => @uu['user_key'],
-                                           :scope => { :uuid => con_scopes['scopes'][0]['uuid'] })
-    cc = Zedlocales::Content.delete(:user_key => @uu['user_key'], :uuid => cs['content'][0]['uuid'])
+    cs = Zedlocales::ContentScopes.content(:user_key => @uu['user_key'], :scope => { :uuid => con_scopes[0]['uuid'] })
+    cc = Zedlocales::Content.delete(:user_key => @uu['user_key'], :uuid => cs[0]['uuid'])
     assert_equal cc, {}
   end
 
   
   def test_get_translations
-    cs = Zedlocales::ContentScopes.content(:user_key => @uu['user_key'],
-                                           :scope => { :uuid => con_scopes['scopes'][0]['uuid'] })
-    tt = Zedlocales::Content.translations(:user_key => @uu['user_key'], :content => { :uuid => cs['content'][0]['uuid'] })
-    assert_equal 2, tt['translations'].length
+    cs = Zedlocales::ContentScopes.content(:user_key => @uu['user_key'], :scope => { :uuid => con_scopes[0]['uuid'] })
+    tt = Zedlocales::Content.translations(:user_key => @uu['user_key'], :content => { :uuid => cs[0]['uuid'] })
+    assert_equal 2, tt.length
   end
 end

data/test/test_content_scopes.rb

@@ -19,7 +19,7 @@ require 'helper'
 
 class TestContentScopes < Test::Unit::TestCase
   def test_get_content_scope
-    cs = Zedlocales::ContentScopes.get(:user_key => @uu['user_key'], :uuid => con_scopes['scopes'][0]['uuid'])
+    cs = Zedlocales::ContentScopes.get(:user_key => @uu['user_key'], :uuid => con_scopes[0]['uuid'])
     assert_equal 'whatever', cs['key']
   end
 
@@ -34,21 +34,20 @@ class TestContentScopes < Test::Unit::TestCase
 
   def test_update_content_scope
     cs = Zedlocales::ContentScopes.update(:user_key => @uu['user_key'],
-                                          :uuid => con_scopes['scopes'][0]['uuid'], :scope => { :key => "updated" })
+                                          :uuid => con_scopes[0]['uuid'], :scope => { :key => "updated" })
     assert_equal 'updated', cs['key']
   end
 
   
   def test_delete_content_scope
-    cs = Zedlocales::ContentScopes.delete(:user_key => @uu['user_key'], :uuid => con_scopes['scopes'][0]['uuid'])
+    cs = Zedlocales::ContentScopes.delete(:user_key => @uu['user_key'], :uuid => con_scopes[0]['uuid'])
     assert_equal cs, {}
   end
   
 
   def test_get_content
-    cs = Zedlocales::ContentScopes.content(:user_key => @uu['user_key'],
-                                           :scope => { :uuid => con_scopes['scopes'][0]['uuid'] })
-    assert_equal 32, cs['content'][0]['uuid'].length
-    assert_equal 'whatever', cs['content'][0]['key']
+    cs = Zedlocales::ContentScopes.content(:user_key => @uu['user_key'], :scope => { :uuid => con_scopes[0]['uuid'] })
+    assert_equal 32, cs[0]['uuid'].length
+    assert_equal 'whatever', cs[0]['key']
   end
 end

data/test/test_content_sections.rb

@@ -47,7 +47,7 @@ class TestContentSections < Test::Unit::TestCase
   
   def test_get_content_section_scopes
     ss = Zedlocales::ContentSections.scopes(:user_key => @uu['user_key'], :section => { :uuid => con_sections[0]['uuid'] })
-    assert_equal 32, ss['scopes'][0]['uuid'].length
-    assert_equal 'whatever', ss['scopes'][0]['key']
+    assert_equal 32, ss[0]['uuid'].length
+    assert_equal 'whatever', ss[0]['key']
   end
 end

data/test/test_simple_backend.rb

@@ -19,17 +19,17 @@ require 'helper'
 
 class TestSimpleBackend < Test::Unit::TestCase
   def test_get_english_locale
-    en = Zedlocales::Simple.get(:en)['content']
+    en = Zedlocales::Simple.get(:en)
   end
 
   def test_get_french_locale
-    fr = Zedlocales::Simple.get(:fr)['content']
+    fr = Zedlocales::Simple.get(:fr)
     assert_not_nil fr
     assert_equal ["dim", "lun", "mar", "mer", "jeu", "ven", "sam"], fr['fr']['date']['abbr_day_names']
   end
 
   def test_get_spanish_locale
-    es = Zedlocales::Simple.get(:es)['content']
+    es = Zedlocales::Simple.get(:es)
     assert_not_nil es
     assert_equal ["Dom", "Lun", "Mar", "Mie", "Jue", "Vie", "Sab"], es['es']['date']['abbr_day_names']
   end

data/test/test_translations.rb

@@ -19,37 +19,37 @@ require 'helper'
 
 class TestContent < Test::Unit::TestCase
   def test_get_translation
-    cs = Zedlocales::ContentScopes.content(:user_key => @uu['user_key'], :scope => { :uuid => con_scopes['scopes'][0]['uuid'] })
-    cc = Zedlocales::Content.translations(:user_key => @uu['user_key'], :content => { :uuid => cs['content'][0]['uuid'] })
-    tt = Zedlocales::Translations.get(:user_key => @uu['user_key'], :uuid => cc['translations'][0]['uuid'])
-    assert_equal tt['content']['uuid'], cs['content'][0]['uuid']
+    cs = Zedlocales::ContentScopes.content(:user_key => @uu['user_key'], :scope => { :uuid => con_scopes[0]['uuid'] })
+    cc = Zedlocales::Content.translations(:user_key => @uu['user_key'], :content => { :uuid => cs[0]['uuid'] })
+    tt = Zedlocales::Translations.get(:user_key => @uu['user_key'], :uuid => cc[0]['uuid'])
+    assert_equal tt['content']['uuid'], cs[0]['uuid']
   end
 
 
   def test_create_translation
-    cs = Zedlocales::ContentScopes.content(:user_key => @uu['user_key'], :scope => { :uuid => con_scopes['scopes'][0]['uuid'] })
-    tt = Zedlocales::Translations.create(:user_key => @uu['user_key'], :content => { :uuid => cs['content'][0]['uuid'] },
+    cs = Zedlocales::ContentScopes.content(:user_key => @uu['user_key'], :scope => { :uuid => con_scopes[0]['uuid'] })
+    tt = Zedlocales::Translations.create(:user_key => @uu['user_key'], :content => { :uuid => cs[0]['uuid'] },
                                          :translation => { :locale => 'de', :source => 'ZEDKIT', :translation => 'yo' })
-    assert_equal cs['content'][0]['uuid'], tt['content']['uuid']
+    assert_equal cs[0]['uuid'], tt['content']['uuid']
     assert_equal 'yo', tt['translation']
   end
 
 
   def test_update_translation
-    cs = Zedlocales::ContentScopes.content(:user_key => @uu['user_key'], :scope => { :uuid => con_scopes['scopes'][0]['uuid'] })
-    cc = Zedlocales::Content.translations(:user_key => @uu['user_key'], :content => { :uuid => cs['content'][0]['uuid'] })
+    cs = Zedlocales::ContentScopes.content(:user_key => @uu['user_key'], :scope => { :uuid => con_scopes[0]['uuid'] })
+    cc = Zedlocales::Content.translations(:user_key => @uu['user_key'], :content => { :uuid => cs[0]['uuid'] })
     tt = Zedlocales::Translations.update(:user_key => @uu['user_key'],
-                                         :uuid => cc['translations'][0]['uuid'], :translation => { :translation => 'yo' })
-    assert_equal cs['content'][0]['uuid'], tt['content']['uuid']
-    assert_equal cc['translations'][0]['uuid'], tt['uuid']
+                                         :uuid => cc[0]['uuid'], :translation => { :translation => 'yo' })
+    assert_equal cs[0]['uuid'], tt['content']['uuid']
+    assert_equal cc[0]['uuid'], tt['uuid']
     assert_equal 'yo', tt['translation']
   end
 
 
   def test_destroy_translation
-    cs = Zedlocales::ContentScopes.content(:user_key => @uu['user_key'], :scope => { :uuid => con_scopes['scopes'][0]['uuid'] })
-    cc = Zedlocales::Content.translations(:user_key => @uu['user_key'], :content => { :uuid => cs['content'][0]['uuid'] })
-    tt = Zedlocales::Translations.get(:user_key => @uu['user_key'], :uuid => cc['translations'][0]['uuid'])
-    assert_equal tt['content']['uuid'], cs['content'][0]['uuid']
+    cs = Zedlocales::ContentScopes.content(:user_key => @uu['user_key'], :scope => { :uuid => con_scopes[0]['uuid'] })
+    cc = Zedlocales::Content.translations(:user_key => @uu['user_key'], :content => { :uuid => cs[0]['uuid'] })
+    tt = Zedlocales::Translations.get(:user_key => @uu['user_key'], :uuid => cc[0]['uuid'])
+    assert_equal tt['content']['uuid'], cs[0]['uuid']
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Eric Woodward
@@ -95,8 +95,8 @@ homepage: http://github.com/ejw/zedlocales
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement