rubyhexagon 0.1.0 → 0.1.1

data/bin/e621

@@ -18,6 +18,8 @@
   along with rubyhexahon.  If not, see <http://www.gnu.org/licenses/>.
 =end
 
-require "rubyhexahon"
+$:.unshift File.dirname(__FILE__)+"/../lib"
+
+require "rubyhexagon"
 
 require "examples/#{ARGV.shift}"

data/lib/container.rb

@@ -35,6 +35,8 @@ module E621
           v = Time.at(v)
         elsif k == "cached_tags" then
           k = "tags"
+        elsif k == "posts" then
+          v.map!{|post|Post.new(post)}
         end
         instance_variable_set("@#{k}",v)
       end

data/lib/examples/add.rb

@@ -28,7 +28,7 @@ $0 = "E621 #{mod}"
 E621::Config.config = File.expand_path("~/.hexagon/conf.json")
 Dir.chdir(File.expand_path(E621::Config.paths["home"])) do
   pools, api = Array.new, API.new(mod)
-  File.open(E621::Config.paths["j#{mod}s"]) do |f|
+  File.open(File.expand_path(E621::Config.paths["j#{mod}s"])) do |f|
     pools = JSON.parser.new(f.read).parse
   end
   puts "Old count: #{pools.length}"
@@ -40,7 +40,7 @@ Dir.chdir(File.expand_path(E621::Config.paths["home"])) do
     if pool["id"] && mod == "pool" then
       pools << id
     elsif pool["id"] && mod == "set" then
-      pools << {"id"=>pool["id"],"owner"=>pool["user-id"]}
+      pools << {"id"=>pool["id"],"owner"=>pool["user_id"]}
     end
   end
   puts "Adding: #{new.length}"
@@ -51,7 +51,7 @@ Dir.chdir(File.expand_path(E621::Config.paths["home"])) do
   end
   puts "New count: #{pools.length}"
   pools = pools.to_json
-  File.open(E621::Config.paths["j#{mod}s"]) do |f|
+  File.open(File.expand_path(E621::Config.paths["j#{mod}s"]),"w") do |f|
     f.print pools
   end
 end

data/lib/pool.rb

@@ -22,6 +22,7 @@ require "digest/md5"
 module E621
   class Pool < Container
     def initialize(post)
+      @api = API.new("pool")
       set_variables(post)
     end
 
@@ -50,5 +51,15 @@ module E621
       end
       return json_hash.to_json
     end
+
+    def each_post
+      (@post_count/24.0).ceil.times do |page|
+        @posts.each do |post|
+          yield post
+        end
+        post = api.get("show",{"id"=>@id,"page"=>page+2})
+        set_variables(post)
+      end
+    end
   end
 end

data/lib/post.rb

@@ -36,7 +36,12 @@ module E621
     end
 
     def download(where)
-      host,port = @file_url.sub(%r{^.+?//},"").sub(%r{/.+$},""),@file_url.match(/^https/) ? 443 : 80
+      if @file_url then
+        host,port = @file_url.sub(%r{^.+?//},"").sub(%r{/.+$},""),@file_url.match(/^https/) ? 443 : 80
+      else
+        host,port = "static1.e621.net",443
+        @file_url = "/data/#{@md5[0,2]}/#{@md5[2,2]}/#@md5.#@file_ext"
+      end
       http = HTTP.new(host,port)
       if !File.exist?(where) then
         body = ""

data/lib/rubyhexagon.rb

@@ -30,5 +30,5 @@ require "pool"
 
 module E621
   Name = "rubyhexagon"
-  Version = "0.1.0"
+  Version = "0.1.1"
 end

data/lib/set.rb

@@ -20,17 +20,27 @@
 module E621
   class Set < Container
     def initialize(post)
-      set_variables(post)
+      @api,@page = API.new("set"),1
+      if post.is_a?(Hash) then
+        set_variables(post)
+      elsif post.is_a?(Fixnum) then
+        set_variables(@api.get("show",{"id"=>post}))
+      else
+        raise ArgumentError, "Parameter must be Hash or Number."
+      end
     end
 
     def add_post(id)
-      api = API.new("set")
-      api.post("add_post",{"post_id"=>id,"set_id"=>@id})
+      @api.post("add_post",{"post_id"=>id,"set_id"=>@id})
     end
 
     def keys
       return instance_variables.map{|i|i.to_s.sub("@","")}
     end
+
+    def name=(name)
+      @name = name
+    end
     
     def to_json
       json_hash = Hash.new
@@ -39,5 +49,11 @@ module E621
       end
       return json_hash.to_json
     end
+
+    def each_post
+      @posts.each do |post|
+        yield post
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubyhexagon
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -18,21 +18,21 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/pool.rb
-- lib/examples/add.rb
-- lib/rubyhexagon.rb
-- lib/standard/hash.rb
-- lib/standard/http.rb
+- lib/config.rb
+- lib/set.rb
 - lib/standard/error.rb
+- lib/standard/http.rb
 - lib/standard/string.rb
 - lib/standard/time.rb
 - lib/standard/int.rb
-- lib/post.rb
+- lib/standard/hash.rb
+- lib/api.rb
+- lib/rubyhexagon.rb
+- lib/pool.rb
 - lib/search.rb
 - lib/container.rb
-- lib/config.rb
-- lib/api.rb
-- lib/set.rb
+- lib/post.rb
+- lib/examples/add.rb
 - bin/e621
 homepage: https://github.com/maxine-red/rubyhexagon
 licenses: