dhole 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ec9a1b3cf83cdf6547b06d5ac378eba04b481f7
-  data.tar.gz: e28f8fffa4fa80acb1b454b08271d906e0ca329c
+  metadata.gz: 75d4063a1ac95ea0d0e709389eacbff99a6dcbb1
+  data.tar.gz: 706e0dbdb55c6268e2d1f641f75fb6b904973107
 SHA512:
-  metadata.gz: f7f0983e1191f2d09d1ff9a1a7a8982c225eeba60d903dd31f5e0db5aab525be3a2bae0ba404fecacb76494048eb0865f7cde858488127d338cce966fe89e1d1
-  data.tar.gz: e9db9f11a06a421bd28a006574196284551a41b868e38e802371d44523439f662155dc887bf0c67da930419fcbf7365bccfc2f4eec63b4a17782b86a246706b0
+  metadata.gz: 6a6f4177fae1b8f22efd068661f190ae6f683476b168e3a53a35d075ca088eb47198a49cb78be5b1e4aa72e772e28874c15a2c3dd5d195febf0f9c2d30dbc7d5
+  data.tar.gz: 8dce7597f898b269e5f9c470c61a28831f8bed0d9a904020d37df42a463d8335b5447fea8b48110c3c87af8c33f82675a63daa637925958d2494490a7b7e36bf

data/dhole.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "activerecord"
+  spec.add_development_dependency "composite_primary_keys"
 end

data/lib/dhole/globalimagelink.rb

@@ -1,7 +1,8 @@
 module Dhole
   class GlobalImageLink < ActiveRecord::Base
     self.table_name = 'globalimagelinks'
-    belongs_to :linking_page, class_name: 'Page', foreign_key: 'gil_from'
+    self.primary_keys = 'gil_to', 'gil_wiki', 'gil_page'
+    #belongs_to :linking_page, class_name: 'Page', foreign_key: 'gil_from'
     #belongs_to :linked_image, class_name: 'Image', foreign_key: 'gil_to' # TODO: replace this with an actual lookup, as this doesn't resolve to an ID, of course
   end
 end

data/lib/dhole/image.rb

@@ -1,6 +1,7 @@
 module Dhole
   class Image < ActiveRecord::Base
     self.table_name = 'image'
+    self.primary_key = 'img_name'
     #has_many :localimagelinks, class_name: 'ImageLink'
     #has_many :localusages, through: :image_links, class_name: 'Page'
     
@@ -10,7 +11,7 @@ module Dhole
       ImageLink.where(il_to: img_name).pluck(:il_from)
     end
     def global_usage
-      GlobalImageLink.where(gil_to: img_name).pluck(:gil_from)
+      GlobalImageLink.where(gil_to: img_name, gil_namespace_id: '0').pluck(:gil_wiki, :gil_page)
     end
   end
 end

data/lib/dhole/page.rb

@@ -1,6 +1,7 @@
 module Dhole
   class Page < ActiveRecord::Base
     self.table_name = 'page'
+    self.primary_key = 'page_id'
     has_many :categories
     has_many :langlinks, class_name: 'LangLink', foreign_key: 'll_from'
     has_many :imagelinks, class_name: 'ImageLink', foreign_key: 'il_from'

data/lib/dhole/revision.rb

@@ -1,6 +1,7 @@
 module Dhole
   class Revision < ActiveRecord::Base
     self.table_name = 'revision'
+    self.primary_key = 'rev_id'
     belongs_to :text, :class_name => 'Text', :foreign_key => 'rev_text_id'
   end
 end

data/lib/dhole/text.rb

@@ -1,6 +1,7 @@
 module Dhole
   class Text < ActiveRecord::Base
     self.table_name = 'text'
+    self.primary_key = 'old_id'
     has_one :revision, :class_name => 'Revision'
   end
 end

data/lib/dhole/version.rb

@@ -1,3 +1,3 @@
 module Dhole
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dhole
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Asaf Bartov
@@ -14,42 +14,56 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: composite_primary_keys
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: ActiveRecord mapping of main Mediawiki entities and relationships
@@ -59,7 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -84,17 +98,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Mediawiki Object-Relational Mapping