lingohub 0.3.1 → 0.4.0

data/lib/lingohub/commands/help.rb

@@ -44,17 +44,7 @@ module Lingohub::Command
 
       group 'Project Commands' do |group|
         group.command 'project:list',                         'list your projects'
-        group.command 'project:create <name>',                'create a new project'
-        group.command 'project:info --project <name>',        'show project info, like web url and number of translations'
         group.command 'project:open --project <name>',        'open the project in a web browser'
-        group.command 'project:rename <oldname> <newname>',   'rename the project'
-        group.space
-      end
-
-      group 'Collaborator Commands' do |group|
-        group.command 'collaborator:list --project <name>',           'list project collaborators'
-        group.command 'collaborator:invite <email> --project <name>', 'invite the collaborator'
-        group.command 'collaborator:remove <email> --project <name>', 'remove the collaborator'
         group.space
       end
 
@@ -62,13 +52,13 @@ module Lingohub::Command
         group.command 'resource:down --all --directory <path> --project <name>',                                          'download all resource files'
         group.command 'resource:down --locale <iso2_code> --all --directory <path> --project <name>',                     'download all resource files, using the given locale as filter'
         group.command 'resource:down <file1> <file2> ... --directory <path> --project <name>',                            'download specific resource files'
-        
+
         up_command = 'resource:up <file1> <file2> ... --locale <iso2_code> --project <name>'
-      
+
         strategy_desc = ""
         Lingohub::Command::Resource::EXPECTED_STRATEGY_PARAMETERS.each do |parameter|
           strategy_desc << " --#{parameter} true|false"
-        end  
+        end
 
         group.command "resource:up <file1> <file2> ... --locale <iso2_code> --project <name> [#{strategy_desc}]",          "upload specific resource files, a locale may be specified to tell lingohub the locale of file content"
         group.space

data/lib/lingohub/commands/project.rb

@@ -17,37 +17,13 @@ module Lingohub::Command
       if list.size > 0
         display "Projects:\n"
         list.each_pair { |name, project|
-          inactive_str = project.inactive? ? '(inactive)' : ''
-          display "- #{name} #{inactive_str}"
+          display "- #{name}"
         }
       else
         display "You have no projects."
       end
     end
 
-    def create
-      title = args.shift.strip rescue nil
-      lingohub.projects.create title
-      display("Created #{title}")
-    end
-
-    def rename
-      oldtitle = args[0].strip rescue raise(CommandFailed, "Invalid old project name")
-      newtitle = args[1].strip rescue raise(CommandFailed, "Invalid new project name")
-
-      project(oldtitle).update(:title => newtitle)
-      display("Project renamed from #{oldtitle} to #{newtitle}")
-    end
-
-    def info
-      display "=== #{project.title}"
-      display "Web URL:        #{project.weburl}"
-      display "Owner:          #{project.owner}"
-      display "Opensource:     #{project.opensource}"
-      display "Locales:        #{project.project_locales}"
-      display "Description:    #{project.description}"
-    end
-
     def open
       Launchy.open project.weburl
     end

data/lib/lingohub/commands/resource.rb

@@ -30,14 +30,6 @@ module Lingohub::Command
 
     private
 
-    def rails_environment?
-      true #TODO
-    end
-
-    def rails_locale_dir
-      Dir.pwd + "/conf/locales"
-    end
-
     def extract_directory_from_args
       return @directory if defined? @directory
       @directory = extract_option('--directory', false)
@@ -53,15 +45,15 @@ module Lingohub::Command
     end
 
     def extract_strategy_parameters
-      result = {}  
-      
+      result = {}
+
       EXPECTED_STRATEGY_PARAMETERS.each do |parameter|
         value = extract_option("--#{parameter}", nil)
         if value
           bool_value = to_bool(value, parameter)
           result.merge!({ parameter => value })
         end
-      end  
+      end
       result
     end
 

data/lib/lingohub/models/project.rb

@@ -1,7 +1,6 @@
 module Lingohub
   module Models
     require 'lingohub/models/resource'
-    require 'lingohub/models/collaborator'
 
     class Project
       def self.lazy_attr_accessor(*params)
@@ -18,39 +17,14 @@ module Lingohub
         end
       end
 
-
-      lazy_attr_accessor(:title, :link, :deactivated_at, :weburl, :resources_url, :collaborators_url, :invitations_url,
-                         :translations_url, :search_url, :activate_url, :owner, :description, :opensource, :project_locales)
+      lazy_attr_accessor(:title, :link, :weburl, :resources_url,
+                         :translations_url, :search_url, :owner, :description, :project_locales)
 
       def initialize(client, link)
         @client = client
         @link = link
       end
 
-      def create!(attributes={ })
-        self.title = attributes[:title]
-      end
-
-      def destroy
-        @client.delete self.link
-      end
-
-      def activate
-        @client.put self.activate_url, {}
-      end
-
-      def update(attributes={ })
-        @client.put self.link, { :project => attributes }
-      end
-
-      def invite_collaborator(email)
-        @client.post(self.invitations_url, :invitation => { :email => email })
-      end
-
-      def inactive?
-        !deactivated_at.nil?
-      end
-
       def resources
         unless defined? @resources
           @resources = { }
@@ -64,24 +38,6 @@ module Lingohub
         @resources
       end
 
-      def collaborators
-        unless defined? @collaborators
-          @collaborators = []
-          response = @client.get(self.collaborators_url)
-          resource_hash = JSON.parse(response)
-          members = resource_hash["members"]
-          members.each do |member|
-            link = member["link"]["href"] rescue ""
-            collaborator = Lingohub::Models::Collaborator.new(@client, link)
-            collaborator.email = member["email"]
-            collaborator.display_name = member["display_name"]
-            collaborator.roles = member["roles"]
-            @collaborators << collaborator
-          end
-        end
-        @collaborators
-      end
-
       def download_resource(directory, filename, locale_as_filter = nil)
         raise "Project does not contain that file." unless self.resources.has_key?(filename)
         resource = self.resources[filename]
@@ -121,16 +77,13 @@ module Lingohub
         weburl = links[1]["href"]
         translations_url = links[2]["href"]
         resources_url = links[3]["href"]
-        collaborators_url = links[4]["href"]
-        invitations_url = links[5]["href"]
-        search_url = links[6]["href"]
+        search_url = links[4]["href"]
 
         init_attributes :title => project_hash["title"], :link => link,
-                        :deactivated_at => project_hash["deactivated_at"], :weburl => weburl,
+                        :weburl => weburl,
                         :owner => project_hash["owner_email"], :description => project_hash["description"],
-                        :opensource => project_hash["opensource"], :project_locales => project_hash["project_locales"],
+                        :project_locales => project_hash["project_locales"],
                         :translations_url => translations_url, :resources_url => resources_url,
-                        :collaborators_url => collaborators_url, :invitations_url => invitations_url,
                         :search_url => search_url
       end
 

data/lib/lingohub/models/projects.rb

@@ -10,10 +10,6 @@ module Lingohub
         @client   = client
       end
 
-      def create(title)
-        @client.post(PROJECT_URL, :project => {:title => title})
-      end
-
       def all
         return @projects if defined? @projects
         @projects = {}

data/lib/lingohub/version.rb

@@ -1,4 +1,4 @@
 module Lingohub
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
   API_VERSION = 'v1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lingohub
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -59,118 +59,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.2
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.8.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.8.0
-- !ruby/object:Gem::Dependency
-  name: fakefs
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: taps
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.23
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.23
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.0
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 description: Client library and command-line tool to translate Ruby based apps with
   lingohub.
 email:
@@ -184,13 +72,11 @@ files:
 - lib/lingohub/command.rb
 - lib/lingohub/commands/auth.rb
 - lib/lingohub/commands/base.rb
-- lib/lingohub/commands/collaborator.rb
 - lib/lingohub/commands/help.rb
 - lib/lingohub/commands/project.rb
 - lib/lingohub/commands/resource.rb
 - lib/lingohub/commands/version.rb
 - lib/lingohub/helpers.rb
-- lib/lingohub/models/collaborator.rb
 - lib/lingohub/models/project.rb
 - lib/lingohub/models/projects.rb
 - lib/lingohub/models/resource.rb
@@ -198,7 +84,6 @@ files:
 - lib/lingohub/rails3/railtie.rb
 - lib/lingohub/version.rb
 - lib/lingohub.rb
-- lib/patches/rails3/i18n/i18n.rb
 - lib/vendor/okjson.rb
 - bin/lingohub
 - LICENSE

data/lib/lingohub/commands/collaborator.rb

@@ -1,44 +0,0 @@
-module Lingohub::Command
-  class Collaborator < Base
-    def list
-      list = project.collaborators
-      if list.size > 0
-        display "Collaborators:\n"
-        list.each { |c| display("- #{c.display_name} | #{c.email} | #{c.permissions}") }
-      else
-        display "No collaborators found"
-      end
-    end
-
-    def invite
-      email = extract_email_from_args
-      project.invite_collaborator(email)
-
-      display("Invitation sent to #{email}")
-    rescue RestClient::BadRequest
-      display("Error sending invitation to '#{email}'")
-    end
-
-    def remove
-      email = extract_email_from_args
-      collaborator = project.collaborators.find { |c| c.email == email }
-
-      if collaborator.nil?
-        display("Collaborator with email '#{email}' not found")
-      else
-        collaborator.destroy
-        display("Collaborator with email #{email} was removed")
-      end
-    rescue RestClient::BadRequest
-      display("Error removing collaborator with email '#{email}'")
-    end
-
-    private
-
-    def extract_email_from_args
-      email = args.shift
-      raise(CommandFailed, "You must specify a invitee email after --email") if email == false
-      email
-    end
-  end
-end

data/lib/lingohub/models/collaborator.rb

@@ -1,25 +0,0 @@
-module Lingohub
-  module Models
-    class Collaborator
-      attr_accessor :email, :display_name, :roles
-
-      ROLES_NAMES = { "project_admin" => "Project admin", "developer" => "Developer" }
-
-      def initialize(client, link)
-        @client = client
-        @link = link
-      end
-
-      def destroy
-        @client.delete @link
-      end
-
-      def permissions
-        return "None" if self.roles.nil? or self.roles.empty?
-
-        self.roles.find_all { |role| ROLES_NAMES.has_key?(role) }.join(", ")
-      end
-
-    end
-  end
-end

data/lib/patches/rails3/i18n/i18n.rb

@@ -1,66 +0,0 @@
-# -*- encoding : utf-8 -*-
-require "stringex"
-
-module I18n
-  class << self
-    alias :base_translate :translate
-    alias :base_localize :localize
-
-    def translate(key, options={ })
-      result = base_translate(key, options)
-      wysiwyt_enabled = options.has_key?(:wysiwyt) ? options.delete(:wysiwyt) : true
-      if wysiwyt_enabled && enabled?
-        result = wrap_with_wysiwyt(key, result)
-        result.html_safe
-      else
-        result
-      end
-    end
-
-    def localize(object, options = { })
-      result = base_localize(object, options)
-      wysiwyt_enabled = options.has_key?(:wysiwyt) ? options.delete(:wysiwyt) : true
-      if wysiwyt_enabled && enabled?
-        result = wrap_with_wysiwyt(object, result)
-        result.html_safe
-      else
-        result
-      end
-    end
-
-    alias :t :translate
-    alias :l :localize
-
-    private
-
-    def enabled?
-      Lingohub.environments.include?(current_env) rescue false
-    end
-
-    def current_env
-      defined?(Rails) ? Rails.env.to_sym : nil
-    end
-
-    def wrap_with_wysiwyt(translation_title, translation_phrase)
-      "<span data-translation_url=\"#{link_to_translation_phrase(translation_title)}\" >#{translation_phrase}</span>"
-    end
-
-    def link_to_translation_phrase(translation_title)
-      username          = option_to_url(Lingohub.username)
-      project           = option_to_url(Lingohub.project)
-      translation_title = translation_title.to_s.to_url
-
-      "#{Lingohub.protocol}://#{Lingohub.host}/#{username}/#{project}/translations/#{translation_title}/phrases/#{locale}"
-    end
-
-    def option_to_url(option)
-      if option.nil?
-        ""
-      elsif Lingohub.default_value?(option)
-        option
-      else
-        option.to_url
-      end
-    end
-  end
-end