amaranth 0.3.0 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 41fff3b6c316afb752696d0db23b7cd10cae4153
-  data.tar.gz: e8c54802636ba6bb9629f5e225549d52d3849a20
+SHA256:
+  metadata.gz: bea88580a7f06515df9387ff76c565d07d8c58b7f2a28c86cc7a89d98248d138
+  data.tar.gz: 21acbfab6b730697f2ecad0290184341396831032f5d3d23ab728c92b2e71fb7
 SHA512:
-  metadata.gz: 49a652968e6e700828e540419bd8551a4646b1a94677a4c5563611d28958950759dc2b53af2bfd69e959a34b26b2c79bc64ec8de9198f2b80198ea79de4488b4
-  data.tar.gz: 4826f362323dd59581e7b64d41c14a138b47470a050bdd01cc8d511d4e377e1300820b88ea254f94b7139ea70b82e9eef15f81237d40d1c37d078f56d1952d96
+  metadata.gz: a90719c85924793222d350857e0552ff1d14664e1222344f56a8cfe7b4635b7b627dcf740b60ddf9792ca562262c48d151f6fc69b45e0c1fa9ca29c09ebb38c3
+  data.tar.gz: 969f665cb658394e64f3492f0202d20976f4574c63de68fa78c9e5fc7916a368b216424de71ec4c950084e1aed3274800fb5cfc7291de7b1d74affe39b2ec7ad

data/amaranth.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "webmock", "~> 1.0"
+  spec.add_development_dependency "webmock", "~> 2.0"
 end

data/lib/amaranth/collection.rb

@@ -0,0 +1,45 @@
+require "amaranth/request"
+
+module Amaranth
+  class Collection
+    private_class_method def self.fetch url
+      json = Request.get(url)
+      objects = json["objects"]
+      next_url = json["meta"]["next"]
+      objects += fetch(next_url) if next_url
+      objects
+    end
+
+    def self.field key
+      @fields ||= []
+      @fields << key
+      attr_accessor key
+    end
+
+    def self.fields
+      @fields
+    end
+
+    def initialize attributes={}
+      self.attributes = attributes
+    end
+
+    def attributes= attributes
+      attributes.each do |key, value|
+        send :"#{key}=", value
+      end
+    end
+
+    def == other
+      self.attributes == other.attributes
+    end
+
+    def attributes
+      self.class.fields.reduce({}) do |attrs, key|
+        attrs.merge key => send(key)
+      end
+    end
+
+    alias_method :to_h, :attributes
+  end
+end

data/lib/amaranth/project.rb

@@ -1,10 +1,15 @@
-require "amaranth/request"
+require "amaranth/collection"
 
 module Amaranth
-  class Project < Struct.new(:name, :slug, :team_slug)
+  class Project < Collection
+    field :name
+    field :slug
+    field :team_slug
+
     def self.all team_slug:
-      Request.get("/api/teams/#{team_slug}/projects/")["objects"].map do |attributes|
-        attributes = attributes.keep_if { |key, value| members.include? key.to_sym }
+      url = "/api/teams/#{team_slug}/projects/?limit=100"
+      fetch(url).map do |attributes|
+        attributes = attributes.keep_if { |key, value| fields.include? key.to_sym }
         attributes["team_slug"] = team_slug
         new attributes
       end
@@ -25,12 +30,6 @@ module Amaranth
       all(team_slug: team_slug).find { |project| project.slug == slug }
     end
 
-    def initialize attributes={}
-      attributes.each do |key, value|
-        self[key] = value
-      end
-    end
-
     def videos
       Video.all(team_slug: team_slug, project_slug: slug)
     end

data/lib/amaranth/request.rb

@@ -27,7 +27,7 @@ module Amaranth
     end
 
     def self.request req, body = nil
-      Net::HTTP.start("www.amara.org", use_ssl: true) do |http|
+      Net::HTTP.start("amara.org", use_ssl: true) do |http|
         req["Content-Type"] = "application/json"
         req["X-api-username"] = Amaranth.api_username
         req["X-api-key"] = Amaranth.api_key

data/lib/amaranth/version.rb

@@ -1,3 +1,3 @@
 module Amaranth
-  VERSION = "0.3.0"
+  VERSION = "0.3.4"
 end

data/lib/amaranth/video.rb

@@ -1,25 +1,27 @@
-require "amaranth/request"
-require "open-uri"
+require "amaranth/collection"
 
 module Amaranth
-  class Video < Struct.new(:id, :title, :description, :duration, :primary_audio_language_code, :thumbnail, :team, :project, :all_urls, :languages)
+  class Video < Collection
+    field :id
+    field :title
+    field :description
+    field :duration
+    field :primary_audio_language_code
+    field :thumbnail
+    field :team
+    field :project
+    field :all_urls
+    field :languages
+
     def self.all team_slug: nil, project_slug: nil
-      url = "https://www.amara.org/api/videos/?limit=100"
+      url = "https://amara.org/api/videos/?limit=100"
       url += "&team=#{team_slug}" if team_slug
       url += "&project=#{project_slug}" if project_slug
       fetch(url).map do |attributes|
-        new attributes.keep_if { |key, value| members.include? key.to_sym }
+        new attributes.keep_if { |key, value| fields.include? key.to_sym }
       end
     end
 
-    private_class_method def self.fetch url
-      json = JSON.parse(open(url).read)
-      objects = json["objects"]
-      next_url = json["meta"]["next"]
-      objects += fetch(next_url) if next_url
-      objects
-    end
-
     def self.create attributes
       Request.post("/api/videos/", attributes)
     end
@@ -27,27 +29,19 @@ module Amaranth
     def self.find_by_video_url video_url
       if json = Request.get("/api/videos/?video_url=#{video_url}")
         attributes = json["objects"].first
-        new attributes.keep_if { |key, value| members.include? key.to_sym }
+        new attributes.keep_if { |key, value| fields.include? key.to_sym }
       end
     end
 
     def self.create_or_update_by_video_url video_url, attributes
       Amaranth::Video.create attributes.merge(video_url: video_url)
     rescue Amaranth::RequestError => exception
-      raise unless exception.message.include?("Video already exists")
+      raise unless exception.message.include?("Video already ")
       Amaranth::Video.find_by_video_url(video_url).update(attributes)
     end
 
-    def initialize attributes={}
-      attributes.each do |key, value|
-        self[key] = value
-      end
-    end
-
     def update attributes={}
-      attributes.each do |key, value|
-        self[key] = value
-      end
+      self.attributes = attributes
       save
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amaranth
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.4
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-01 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 description: 
 email:
 - micah@botandrose.com
@@ -70,6 +70,7 @@ files:
 - bin/console
 - bin/setup
 - lib/amaranth.rb
+- lib/amaranth/collection.rb
 - lib/amaranth/config.rb
 - lib/amaranth/project.rb
 - lib/amaranth/request.rb
@@ -95,8 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Library for accessing the Amara REST API