zedlocales 1.1.2 → 1.1.3

data/Rakefile

@@ -25,11 +25,14 @@ begin
     gem.summary = %Q{gem for localization support in Zedkit applications}
     gem.description = %Q{gem for localization support in Zedkit applications to generate locale files and load translations via the Zedkit API}
 
-    gem.email = "ejw@zedkit.com"
-    gem.homepage = "http://github.com/ejw/zedlocales"
-    gem.authors = ["Eric Woodward"]
+    gem.email = "support@zedkit.com"
+    gem.homepage = "http://github.com/zedkit/zedlocales"
+    gem.authors = ["Zedkit"]
     gem.rubyforge_project = "zedlocales"
+
     gem.files = FileList['[A-Z]*', 'lib/**/*.rb', 'lib/tasks/*.rake', 'test/**/*.rb']
+    gem.executables = %w(zedlocales)
+    gem.default_executable = %q{zedlocales}
 
     gem.add_dependency 'zedkit', '>= 1.1.0'
     gem.add_dependency 'json', '>= 1.4.4'

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/bin/zedlocales

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+##
+# Copyright (c) Zedkit.
+#
+# 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.
+##
+
+require 'zedlocales'
+
+Dir["#{File.dirname(__FILE__)}/../lib/cli/*.rb"].each {|ci| require ci }
+
+Zedlocales::CLI::Runner.new.go!

data/lib/cli/config.rb

@@ -0,0 +1,20 @@
+##
+# Copyright (c) Zedkit.
+#
+# 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.
+##
+
+Zedkit.configure do |zk|
+  zk.exceptions = true
+end

data/lib/cli/projects.rb

@@ -0,0 +1,33 @@
+##
+# Copyright (c) Zedkit.
+#
+# 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.
+##
+
+module Zedlocales
+  module CLI
+    class Projects < Zedkit::CLI::Bottom
+      class << self
+        def list(opts = {})
+          puts "\n Still TBD\n\n"
+        end
+
+        def codes(opts = {})
+          puts "\n Still TBD\n\n"
+        end
+      end
+    end
+  end
+end
+

data/lib/cli/runner.rb

@@ -0,0 +1,37 @@
+##
+# Copyright (c) Zedkit.
+#
+# 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.
+##
+
+module Zedlocales
+  module CLI
+    class Runner < Zedkit::CLI::Runner
+      SECTIONS = ['sections','scopes','content']
+
+      protected
+      def just_do_it
+        klass = Object.const_get('Zedlocales').const_get('CLI').const_get(section.capitalize)
+        klass.send command.to_sym, :user_key => user_key, :items => items_to_key_value_hash, :argv => ARGV
+      end
+      def map
+           "\n" \
+        << "== Project Commands\n\n" \
+        << "list <uuid>                                 # List project content structure\n" \
+        << "codes                                       # Outline applicable entity codes for ZedDB\n\n" \
+        << "==\n\n"
+      end
+    end
+  end
+end

data/lib/tasks/generate.rake

@@ -18,11 +18,5 @@
 namespace :zedlocales do
   desc "Generates the project's locale files with the latest content and translations"
   task :generate => :environment do
-
-    # puts "Acquiring Locale for Simple Backend [#{locale}]..."
-    # puts "DONE"
-
-    Zedlocales::Client.get_locales
-
   end
 end

data/lib/zedlocales.rb

@@ -20,10 +20,12 @@ require 'zedkit'
 
 module Zedlocales
   class << self
-    def entities(user_key)
-      reshh = Zedkit::Client.get('v1/entities/zedlocales', user_key)
-      yield(reshh) if (not reshh.nil?) && block_given?
-      reshh
+    def entities
+      rs = Zedkit::Client.get('entities/zedlocales')
+      if rs && block_given?
+        rs.is_a?(Array) ? rs.each {|i| yield(i) } : yield(rs)
+      end
+      rs
     end
   end
 end
@@ -33,5 +35,6 @@ require 'zedlocales/content_sections'
 require 'zedlocales/content_scopes'
 require 'zedlocales/content'
 require 'zedlocales/translations'
+
 require 'zedlocales/simple'
 require 'zedlocales/railtie' if defined?(Rails::Railtie)

data/lib/zedlocales/content.rb

@@ -19,12 +19,8 @@ module Zedlocales
   class Content
     class Translations
       class << self
-        def get(*args)
-          zopts = args.extract_zedkit_options!
-          reshh = Zedkit::Client.get("content/translations/#{zopts[:uuid]}", zopts[:user_key],
-                                                            zopts.zdelete_keys!(%w(user_key)))
-          yield(reshh) if (not reshh.nil?) && block_given?
-          reshh
+        def get(zks = {}, &block)
+          Zedkit::Client.crud(:get, "content/translations", zks, [], &block)
         end
       end
     end
@@ -67,34 +63,20 @@ module Zedlocales
       #   end
       #
 
-      def get(*args)
-        zopts = args.extract_zedkit_options!
-        reshh = Zedkit::Client.get("content/content/#{zopts[:uuid]}", zopts[:user_key],
-                                                zopts.zdelete_keys!(%w(uuid user_key)))
-        yield(reshh) if (not reshh.nil?) && block_given?
-        reshh
+      def get(zks = {}, &block)
+        Zedkit::Client.crud(:get, "content/content/#{zks[:uuid]}", zks, [], &block)
       end
 
-      def create(*args)
-        zopts = args.extract_zedkit_options!
-        reshh = Zedkit::Client.create('content/content', zopts[:user_key], zopts.zdelete_keys!(%w(user_key)))
-        yield(reshh) if (not reshh.nil?) && block_given?
-        reshh
+      def create(zks = {}, &block)
+        Zedkit::Client.crud(:create, 'content/content', zks, [], &block)
       end
 
-      def update(*args)
-        zopts = args.extract_zedkit_options!
-        reshh = Zedkit::Client.update("content/content/#{zopts[:uuid]}", zopts[:user_key],
-                                                   zopts.zdelete_keys!(%w(uuid user_key)))
-        yield(reshh) if (not reshh.nil?) && block_given?
-        reshh
+      def update(zks = {}, &block)
+        Zedkit::Client.crud(:update, "content/content/#{zks[:uuid]}", zks, [], &block)
       end
 
-      def delete(*args)
-        zopts = args.extract_zedkit_options!
-        reshh = Zedkit::Client.delete("content/content/#{zopts[:uuid]}", zopts[:user_key])
-        yield(reshh) if (not reshh.nil?) && block_given?
-        reshh
+      def delete(zks = {}, &block)
+        Zedkit::Client.crud(:delete, "content/content/#{zks[:uuid]}", zks, [], &block)
       end
     end
   end

data/lib/zedlocales/content_scopes.rb

@@ -19,15 +19,12 @@ module Zedlocales
   class ContentScopes
     class Content
       class << self
-        def get(*args)
-          zopts = args.extract_zedkit_options!
-          reshh = Zedkit::Client.get('content/content', zopts[:user_key], zopts.zdelete_keys!(%w(user_key)))
-          yield(reshh) if (not reshh.nil?) && block_given?
-          reshh
+        def get(zks = {}, &block)
+          Zedkit::Client.crud(:get, "content/content", zks, [], &block)
         end
       end
     end
-    
+
     class << self
       #
       # = Zedlocales Content Scopes
@@ -66,34 +63,20 @@ module Zedlocales
       #   end
       #
 
-      def get(*args)
-        zopts = args.extract_zedkit_options!
-        reshh = Zedkit::Client.get("content/scopes/#{zopts[:uuid]}", zopts[:user_key],
-                                               zopts.zdelete_keys!(%w(uuid user_key)))
-        yield(reshh) if (not reshh.nil?) && block_given?
-        reshh
+      def get(zks = {}, &block)
+        Zedkit::Client.crud(:get, "content/scopes/#{zks[:uuid]}", zks, [], &block)
       end
 
-      def create(*args)
-        zopts = args.extract_zedkit_options!
-        reshh = Zedkit::Client.create('content/scopes', zopts[:user_key], zopts.zdelete_keys!(%w(user_key)))
-        yield(reshh) if (not reshh.nil?) && block_given?
-        reshh
+      def create(zks = {}, &block)
+        Zedkit::Client.crud(:create, 'content/scopes', zks, [], &block)
       end
 
-      def update(*args)
-        zopts = args.extract_zedkit_options!
-        reshh = Zedkit::Client.update("content/scopes/#{zopts[:uuid]}", zopts[:user_key],
-                                                  zopts.zdelete_keys!(%w(uuid user_key)))
-        yield(reshh) if (not reshh.nil?) && block_given?
-        reshh
+      def update(zks = {}, &block)
+        Zedkit::Client.crud(:update, "content/scopes/#{zks[:uuid]}", zks, [], &block)
       end
 
-      def delete(*args)
-        zopts = args.extract_zedkit_options!
-        reshh = Zedkit::Client.delete("content/scopes/#{zopts[:uuid]}", zopts[:user_key])
-        yield(reshh) if (not reshh.nil?) && block_given?
-        reshh
+      def delete(zks = {}, &block)
+        Zedkit::Client.crud(:delete, "content/scopes/#{zks[:uuid]}", zks, [], &block)
       end
     end
   end

data/lib/zedlocales/content_sections.rb

@@ -19,15 +19,12 @@ module Zedlocales
   class ContentSections
     class ContentScopes
       class << self
-        def get(*args)
-          zopts = args.extract_zedkit_options!
-          reshh = Zedkit::Client.get('content/scopes', zopts[:user_key], zopts.zdelete_keys!(%w(user_key)))
-          yield(reshh) if (not reshh.nil?) && block_given?
-          reshh
+        def get(zks = {}, &block)
+          Zedkit::Client.crud(:get, "content/scopes", zks, [], &block)
         end
       end
     end
-
+ 
     class << self
       #
       # = Zedlocales Content Sections
@@ -66,34 +63,20 @@ module Zedlocales
       #   end
       #
 
-      def get(*args)
-        zopts = args.extract_zedkit_options!
-        reshh = Zedkit::Client.get("content/sections/#{zopts[:uuid]}", zopts[:user_key],
-                                                 zopts.zdelete_keys!(%w(uuid user_key)))
-        yield(reshh) if (not reshh.nil?) && block_given?
-        reshh
+      def get(zks = {}, &block)
+        Zedkit::Client.crud(:get, "content/sections/#{zks[:uuid]}", zks, [], &block)
       end
 
-      def create(*args)
-        zopts = args.extract_zedkit_options!
-        reshh = Zedkit::Client.create('content/sections', zopts[:user_key], zopts.zdelete_keys!(%w(user_key)))
-        yield(reshh) if (not reshh.nil?) && block_given?
-        reshh
+      def create(zks = {}, &block)
+        Zedkit::Client.crud(:create, 'content/sections', zks, [], &block)
       end
 
-      def update(*args)
-        zopts = args.extract_zedkit_options!
-        reshh = Zedkit::Client.update("content/sections/#{zopts[:uuid]}", zopts[:user_key],
-                                                    zopts.zdelete_keys!(%w(uuid user_key)))
-        yield(reshh) if (not reshh.nil?) && block_given?
-        reshh
+      def update(zks = {}, &block)
+        Zedkit::Client.crud(:update, "content/sections/#{zks[:uuid]}", zks, [], &block)
       end
 
-      def delete(*args)
-        zopts = args.extract_zedkit_options!
-        reshh = Zedkit::Client.delete("content/sections/#{zopts[:uuid]}", zopts[:user_key])
-        yield(reshh) if (not reshh.nil?) && block_given?
-        reshh
+      def delete(zks = {}, &block)
+        Zedkit::Client.crud(:delete, "content/sections/#{zks[:uuid]}", zks, [], &block)
       end
     end
   end

data/lib/zedlocales/projects.rb

@@ -19,46 +19,29 @@ module Zedkit
   class Projects
     class ContentSections
       class << self
-        def get(*args)
-          zopts = args.extract_zedkit_options!
-          reshh = Zedkit::Client.get('content/sections', zopts[:user_key], zopts.zdelete_keys!(%w(user_key)))
-          yield(reshh) if (not reshh.nil?) && block_given?
-          reshh
+        def get(zks = {}, &block)
+          Zedkit::Client.crud(:get, "content/sections", zks, [], &block)
         end
       end
     end
 
     class Locales
       class << self
-        def get(*args)
-          zopts = args.extract_zedkit_options!
-          reshh = Zedkit::Client.get("projects/#{zopts[:project][:uuid]}/locales", zopts[:user_key])
-          yield(reshh) if (not reshh.nil?) && block_given?
-          reshh
+        def get(zks = {}, &block)
+          Zedkit::Client.crud(:get, "projects/#{zks[:project][:uuid]}/locales", zks, %w(project), &block)
         end
 
-        def create(*args)
-          zopts = args.extract_zedkit_options!
-          reshh = Zedkit::Client.create("projects/#{zopts[:project][:uuid]}/locales", zopts[:user_key],
-                                                             zopts.zdelete_keys!(%w(user_key project)))
-          yield(reshh) if (not reshh.nil?) && block_given?
-          reshh
+        def create(zks = {}, &block)
+          Zedkit::Client.crud(:create, "projects/#{zks[:project][:uuid]}/locales", zks, %w(project), &block)
         end
 
-        def update(*args)
-          zopts = args.extract_zedkit_options!
-          reshh = Zedkit::Client.update("projects/#{zopts[:project][:uuid]}/locales/#{zopts[:locale][:code]}",
-                                                  zopts[:user_key], zopts.zdelete_keys!(%w(user_key project)))
-          yield(reshh) if (not reshh.nil?) && block_given?
-          reshh
+        def update(zks = {}, &block)
+          Zedkit::Client.crud(:update,
+                              "projects/#{zks[:project][:uuid]}/locales/#{zks[:locale][:code]}", zks, %w(project), &block)
         end
 
-        def delete(*args)
-          zopts = args.extract_zedkit_options!
-          reshh = Zedkit::Client.delete("projects/#{zopts[:project][:uuid]}/locales/#{zopts[:locale][:code]}",
-                                                                                             zopts[:user_key])
-          yield(reshh) if (not reshh.nil?) && block_given?
-          reshh
+        def delete(zks = {}, &block)
+          Zedkit::Client.crud(:delete, "projects/#{zks[:project][:uuid]}/locales/#{zks[:locale][:code]}", zks, [], &block)
         end
       end
     end

data/lib/zedlocales/simple.rb

@@ -40,7 +40,8 @@ module Zedlocales
 
       private
       def locale_head
-        tmps  = "##\n"
+        tmps  = "# encoding: UTF-8\n"
+        tmps << "##\n"
         tmps << "# DO NOT EDIT THIS FILE.\n"
         tmps << "# This locale file is auto-generated from the ZedAPI by the ZedLocales Ruby gem. Any manual updates to an rb\n"
         tmps << "# file will be lost when this file is regenerated, with this current file only versioned once, or discarded.\n"

data/lib/zedlocales/translations.rb

@@ -18,35 +18,23 @@
 module Zedlocales
   class Translations
     class << self
-      def get(*args)
-        zopts = args.extract_zedkit_options!
-        reshh = Zedkit::Client.get("content/translations/#{zopts[:uuid]}", zopts[:user_key],
-                                                     zopts.zdelete_keys!(%w(uuid user_key)))
-        yield(reshh) if (not reshh.nil?) && block_given?
-        reshh
+      def get(zks = {}, &block)
+        Zedkit::Client.crud(:get, "content/translations/#{zks[:uuid]}", zks, [], &block)
       end
 
-      def create(*args)
-        zopts = args.extract_zedkit_options!
-        reshh = Zedkit::Client.create('content/translations', zopts[:user_key], zopts.zdelete_keys!(%w(user_key)))
-        yield(reshh) if (not reshh.nil?) && block_given?
-        reshh
+      def create(zks = {}, &block)
+        Zedkit::Client.crud(:create, 'content/translations', zks, [], &block)
       end
 
-      def update(*args)
-        zopts = args.extract_zedkit_options!
-        reshh = Zedkit::Client.update("content/translations/#{zopts[:uuid]}", zopts[:user_key],
-                                                        zopts.zdelete_keys!(%w(uuid user_key)))
-        yield(reshh) if (not reshh.nil?) && block_given?
-        reshh
+      def update(zks = {}, &block)
+        Zedkit::Client.crud(:update, "content/translations/#{zks[:uuid]}", zks, [], &block)
       end
 
-      def delete(*args)
-        zopts = args.extract_zedkit_options!
-        reshh = Zedkit::Client.delete("content/translations/#{zopts[:uuid]}", zopts[:user_key])
-        yield(reshh) if (not reshh.nil?) && block_given?
-        reshh
+      def delete(zks = {}, &block)
+        Zedkit::Client.crud(:delete, "content/translations/#{zks[:uuid]}", zks, [], &block)
       end
     end
   end
 end
+
+

data/test/test_content.rb

@@ -24,14 +24,14 @@ class TestContent < Test::Unit::TestCase
     assert_equal 2, tt.length
   end
 
-  def test_get_content
+  def test_get
     cs = Zedlocales::ContentScopes::Content.get(: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[0]['uuid'], cc['uuid']
   end
 
-  def test_create_content
+  def test_create
     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
@@ -39,7 +39,7 @@ class TestContent < Test::Unit::TestCase
     assert_equal 'yo yo', cc['content']
   end
   
-  def test_update_content
+  def test_update
     cs = Zedlocales::ContentScopes::Content.get(: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']
@@ -47,9 +47,8 @@ class TestContent < Test::Unit::TestCase
     assert_equal 'yo', cc['content']
   end
 
-  def test_destroy_content
+  def test_destroy
     cs = Zedlocales::ContentScopes::Content.get(: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, {}
+    assert_nil Zedlocales::Content.delete(:user_key => @uu['user_key'], :uuid => cs[0]['uuid'])
   end
 end

data/test/test_content_scopes.rb

@@ -24,26 +24,25 @@ class TestContentScopes < Test::Unit::TestCase
     assert_equal 'whatever', cs[0]['key']
   end
 
-  def test_get_content_scope
+  def test_get
     cs = Zedlocales::ContentScopes.get(:user_key => @uu['user_key'], :uuid => con_scopes[0]['uuid'])
     assert_equal 'whatever', cs['key']
   end
 
-  def test_create_content_scope
+  def test_create
     cs = Zedlocales::ContentScopes.create(:user_key => @uu['user_key'],
                                          :section => { :uuid => con_sections[0]['uuid'] }, :scope => { :key => 'neww' })                                  
     assert_equal 'neww', cs['key']
     assert_equal 32, cs['uuid'].length
   end
 
-  def test_update_content_scope
+  def test_update
     cs = Zedlocales::ContentScopes.update(:user_key => @uu['user_key'],
                                           :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[0]['uuid'])
-    assert_equal cs, {}
+  def test_delete
+    assert_nil Zedlocales::ContentScopes.delete(:user_key => @uu['user_key'], :uuid => con_scopes[0]['uuid'])
   end
 end

data/test/test_content_sections.rb

@@ -25,26 +25,26 @@ class TestContentSections < Test::Unit::TestCase
     assert_equal 'whatever', ss[0]['key']
   end
 
-  def test_get_content_section
+  def test_get
     ss = Zedlocales::ContentSections.get(:user_key => @uu['user_key'], :uuid => con_sections[0]['uuid'])
     assert_equal 'whatever', ss['key']
     assert_equal 32, ss['uuid'].length
   end
 
-  def test_create_content_section
+  def test_create
     ss = Zedlocales::ContentSections.create(:user_key => @uu['user_key'], :project => { :uuid => @uu['projects'][0] },
                                            :section => { :key => 'newsection' })
     assert_equal 32, ss['uuid'].length
     assert_equal 'newsection', ss['key']
   end
 
-  def test_update_content_section
+  def test_update
     ss = Zedlocales::ContentSections.update(:user_key => @uu['user_key'],
                                             :uuid => con_sections[0]['uuid'], :section => { :key => 'updatedsection' })
     assert_equal 'updatedsection', ss['key']
   end
 
-  def test_delete_content_section
-    assert_equal Zedlocales::ContentSections.delete(:user_key => @uu['user_key'], :uuid => con_sections[0]['uuid']), {}
+  def test_delete
+    assert_nil Zedlocales::ContentSections.delete(:user_key => @uu['user_key'], :uuid => con_sections[0]['uuid'])
   end
 end

data/test/test_projects.rb

@@ -50,9 +50,7 @@ class TestProjects < Test::Unit::TestCase
   end
 
   def test_delete_locale_connection
-    pl = Zedkit::Projects::Locales.delete(:user_key => @uu['user_key'], :project => { :uuid => @uu['projects'][0] },
-                                                                        :locale => { :code => 'fr'})
-    assert pl.is_a? Hash
-    assert_equal pl, {}
+    assert_nil Zedkit::Projects::Locales.delete(:user_key => @uu['user_key'], :project => { :uuid => @uu['projects'][0] },
+                                                                              :locale => { :code => 'fr'})
   end
 end

data/test/test_translations.rb

@@ -18,14 +18,14 @@
 require 'helper'
 
 class TestContent < Test::Unit::TestCase
-  def test_get_translation
+  def test_get
     cs = Zedlocales::ContentScopes::Content.get(:user_key => @uu['user_key'], :scope => { :uuid => con_scopes[0]['uuid'] })
     cc = Zedlocales::Content::Translations.get(: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
+  def test_create
     cs = Zedlocales::ContentScopes::Content.get(: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' })
@@ -33,7 +33,7 @@ class TestContent < Test::Unit::TestCase
     assert_equal 'yo', tt['translation']
   end
 
-  def test_update_translation
+  def test_update
     cs = Zedlocales::ContentScopes::Content.get(:user_key => @uu['user_key'], :scope => { :uuid => con_scopes[0]['uuid'] })
     cc = Zedlocales::Content::Translations.get(:user_key => @uu['user_key'], :content => { :uuid => cs[0]['uuid'] })
     tt = Zedlocales::Translations.update(:user_key => @uu['user_key'],
@@ -43,10 +43,9 @@ class TestContent < Test::Unit::TestCase
     assert_equal 'yo', tt['translation']
   end
 
-  def test_destroy_translation
+  def test_destroy
     cs = Zedlocales::ContentScopes::Content.get(:user_key => @uu['user_key'], :scope => { :uuid => con_scopes[0]['uuid'] })
     cc = Zedlocales::Content::Translations.get(: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']
+    assert_nil Zedlocales::Translations.delete(:user_key => @uu['user_key'], :uuid => cc[0]['uuid'])
   end
 end

metadata

@@ -5,17 +5,17 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
-- Eric Woodward
+- Zedkit
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 -08:00
-default_executable: 
+date: 2011-01-06 00:00:00 -08:00
+default_executable: zedlocales
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: zedkit
@@ -61,9 +61,9 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 description: gem for localization support in Zedkit applications to generate locale files and load translations via the Zedkit API
-email: ejw@zedkit.com
-executables: []
-
+email: support@zedkit.com
+executables: 
+- zedlocales
 extensions: []
 
 extra_rdoc_files: 
@@ -74,6 +74,9 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- lib/cli/config.rb
+- lib/cli/projects.rb
+- lib/cli/runner.rb
 - lib/tasks/generate.rake
 - lib/zedlocales.rb
 - lib/zedlocales/content.rb
@@ -91,8 +94,9 @@ files:
 - test/test_projects.rb
 - test/test_simple_backend.rb
 - test/test_translations.rb
+- bin/zedlocales
 has_rdoc: true
-homepage: http://github.com/ejw/zedlocales
+homepage: http://github.com/zedkit/zedlocales
 licenses: []
 
 post_install_message: